Résolution de conflits
Merge branch 'dev' of
git@github.com:soutenanceplanner/soutenanceplanner.git into dev

Conflicts:
	src/main/java/com/angers/m2sili/soutenance/repository/OralRepository.java
	src/main/java/com/angers/m2sili/soutenance/service/OralService.java
	src/main/java/com/angers/m2sili/soutenance/service/impl/OralServiceImpl.java
	src/main/java/com/angers/m2sili/soutenance/web/CalendarController.java

	SUppresion d'un calendrier