Merge branch 'master' into feature/maintenance

Conflicts:
	api.js
* Reverting configuration change in demo for settings.js
Merge branch 'feature/maintenance' of github.com:stelcheck/statusdashboard into feature/maintenance
* Changed port... again