Testing

Login and class of service testing
Merge branch 'master' of https://github.com/Flaapjan/TEst

Conflicts:
	test/unit/controllersSpec.js