preliminary commit in order to merge
Merge branch 'master' of https://github.com/tijs14tijs/ROAD
fixed vehicledao query that still searched for userID. changed it to user.id
Merge branch 'master' of https://github.com/tijs14tijs/ROAD