A.T.
Merge branch 'gui' of https://github.com/sdefauw/CarPooling
Update Traject object (ID)
Merge branch 'master' of https://github.com/sdefauw/CarPooling
/!\ TODO: Faire la méthode en plus (voir signature)
Update Traject (Passanger)
Merge branch 'gui' of https://github.com/sdefauw/CarPooling

Conflicts:
	carpooling/app/views/user/view.scala.html