New tests for the login functionality
Merge branch 'develop' of https://github.com/BorjaL/Web-gamification into develop

Conflicts:
	apps/login/loginSpec.js
	package.json
	test/karma.conf.js