working on GUI
sa
moved the sun to its own controller + moved some gui
working on making tabs
Merge remote-tracking branch 'origin/MEtte' into development

Conflicts:
	js/controllers/statusController.js