fixed logs and did some styling for labels on overview
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	app/partials/settings.html
	app/scripts/angular/services/settings.js