edit user integration tests back-end
Not a full commit
edit user integration tests back-end
Not a full commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/js/controllers/RegisterController.js
	src/main/webapp/json/languages/en_US.json
	src/main/webapp/json/languages/nl_NL.json