tripsUser
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/teamf/controller/TripController.java
Merge remote-tracking branch 'origin/master'
tripsUser
Merge remote-tracking branch 'origin/master'