Task #353672
Merge

Conflicts:
	app/index.html
	app/js/app.js
commit
merge

Conflicts:
	app/index.html
	app/js/app.js
	app/js/controller/userController.js