ajout d'un controller et un service pour Calendar
Merge branch 'dev' of
git@github.com:soutenanceplanner/soutenanceplanner.git into dev

Conflicts:
	src/main/java/com/angers/m2sili/soutenance/service/UserService.java
	src/main/java/com/angers/m2sili/soutenance/service/impl/UserServiceImpl.java
	src/main/java/com/angers/m2sili/soutenance/web/UserController.java