Settings to service WIP | fix login
Merge remote-tracking branch 'origin/sasha' into sasha

Conflicts:
	app/js/services.js