Added a whole bunch of stuff that failed to fix things.
Resolved merge conflict in SensorDB.cpp