New UI changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/js/controllers/user/mapUserController.js
adding exam function