Merge branch 'hotfix/0.3.1' into develop
Alarms: add high/low disable setting
Feature: Disable High/Low Alarms
Merge branch 'feature/disable-alarms' into develop
Disable test code.
Another attempt to fix the stale data colors remaining.
Merge branch 'hotfix/0.3.2' into develop

Conflicts:
	static/js/client.js
Merge pull request #2 from drcameron/develop

Develop