commit
Merge branch 'master' of https://github.com/kevinramage/Convoiturage

Conflicts:
	convoiturage.server/src/main/java/mmm/convoiturage/server/business/Notification.java
	convoiturage.server/src/main/java/mmm/convoiturage/server/business/User.java