Merge branch 'dev_lj' of http://whycrzg@118.89.139.230:10101/r/~whyclj/BattMonitor_DB_Builder.git into dev_lj