cube dashboard
Merge branch 'master' of github.com:Dandandan/LightSaver

Conflicts:
	client/main.css