Commit pre-pull
Merge branch 'master' of https://github.com/alacrampe/Agenda_Rest_Server

Conflicts:
	src/fr/ingesup/agenda/ws/dao/DAOException.java
	src/fr/ingesup/agenda/ws/dao/DAOService.java
DAOEventService.save