edit theme test
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/test/java/be/kdg/trips/TripTest.java
tripctrl
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/java/be/kdg/trips/controllers/TripController.java
	WebApp/src/test/java/be/kdg/trips/TripTest.java
trip ctrl
Merge remote-tracking branch 'origin/master'