support for status and alarms
Merge remote-tracking branch 'origin/master'

Conflicts:
	ddsc_api/static/ddsc_api/management/settings.js