Fix Jasmine tests

Conflicts:
	app/html/changeUsernameAndPassword.html
	app/js/changePassword.js
	app/js/changeUsernameAndPassword.js
	app/js/login.js
Merge branch 'master' into fix_tests

Conflicts:
	app/html/changeUsernameAndPassword.html
	app/js/changePassword.js
	app/js/changeUsernameAndPassword.js
	app/js/login.js
Merge pull request #95 from jsha/fix_tests

Fix tests