added sun
removed console log
fixed string compare should be int compare
removed console log
Merge branch 'rasmusPromise' into development

Conflicts:
	js/controllers/statusController.js
Merge remote-tracking branch 'origin/Mette' into development

Conflicts:
	js/controllers/statusController.js