Merge branch 'NEW-MASTER' into Greg-Sauce
Merge branch 'NEW-MASTER' into Greg-Sauce
virtual data collection for the office system

constant fake voltages set for everything instead of measure from a
physical string
pseudodata
fix ignore, lowBalAlarm, and pseudo code
Merge remote-tracking branch 'origin/NEW-MASTER' into Nima-Ghods
remove extra voltage update
stop saturation during the balance relax time
fix flag print out
update the date
make ignore to be the same as clear
update flags and changes bmcComFalg to three seconds
update python and add java script
Change bmc com time from 3 sec to 5 sec
fix bal rec
realy fix bal rec
fix override
change bmcCom time back to 10 sec
remove "!"
Merge branch 'Nima-Ghods' into NEW-MASTER