Traject:Driver: add user
Merge branch 'master' of https://github.com/sdefauw/CarPooling

Conflicts:
	carpooling/test/ApplicationTest.java