ok
Merge branch 'dev' of
git@github.com:soutenanceplanner/soutenanceplanner.git into dev

Conflicts:
	src/main/webapp/src/app/oral/OralCtrl.js