alle 3
Merge branch 'origin/feature-fix-tests'

Conflicts:
	test/unit/routes/contacts-ctrl.fix.amd-spec.js
moep
Merge branch 'origin/feature-fix-tests'

Conflicts:
	app/comps/login/login-drtv.js
	app/routes/registration/registration-ctrl.js
testing tests
Merge branch 'origin/feature-fix-tests'
update
106 tests run, without inject model contacts at contacts-ctrl