correction Matching (nullpointeur exception)
correction lock (unlock quand exception) dans Traject record
Merge branch 'master' of https://github.com/sdefauw/CarPooling

Conflicts:
	carpooling/app/controllers/Matching.java