Proposal
Merge branch 'master' of https://github.com/sdefauw/CarPooling

Conflicts:
	carpooling/conf/evolutions/default/1.sql