PrePullCommit
Test
Merge branch 'master' of https://github.com/alacrampe/Agenda_Rest_Server

Conflicts:
	src/fr/ingesup/agenda/ws/models/Event.java
	src/fr/ingesup/agenda/ws/services/EventService.java