Correction des web services
Merge branch 'master' of https://github.com/kevinramage/Convoiturage

Conflicts:
	convoiturage.server/hsqldb/hsqldb/data/test.lck
	convoiturage.server/hsqldb/hsqldb/data/test.log