merge
Merge branch 'dev' of
https://github.com/soutenanceplanner/soutenanceplanner.git into dev

Conflicts:
	src/main/java/com/angers/m2sili/soutenance/web/CalendarController.java