Pre-pull commit
Fix Dirty Work Tree
Dirty Fix
Merge branch 'master' of https://github.com/alacrampe/Agenda_Rest_Server

Conflicts:
	src/fr/ingesup/agenda/ws/models/Meeting.java
	src/fr/ingesup/agenda/ws/models/Period.java
	src/fr/ingesup/agenda/ws/serializer/EventSerializer.java
	src/fr/ingesup/agenda/ws/services/EventService.java
Merge branch 'master' of https://github.com/alacrampe/Agenda_Rest_Server
Fix
EventSerializer fix+ UserSerializer+ UserServiceDaoImpl