Factory/Enum service + controller User
Merge branch 'dev' of
https://github.com/soutenanceplanner/soutenanceplanner.git into dev

Conflicts:
	src/main/webapp/src/app/account/add.tpl.html