#CAM-129, fixed, still no tests
Merge branch 'dev'

Conflicts:
	app/index.html
	app/js/controller/login.js
Merge branch 'feature-Feature-hashing'