merge avec clean sur login/logout
Merge branch 'dev' of
https://github.com/soutenanceplanner/soutenanceplanner.git into dev

Conflicts:
	src/main/webapp/src/app/app.js
	src/main/webapp/src/common/header.tpl.html
	src/main/webapp/src/common/menu/menuLeft.tpl.html
Merge branch 'dev' of https://github.com/soutenanceplanner/soutenanceplanner.git into dev