Coherent UI test
Merge branch 'master' into Coherent

Conflicts:
	js/dashboard
	js/gauge/app.js
Merge branch 'master' into Coherent

Conflicts:
	js/dashboard
	js/gauge/app.js
Updates