themes final
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/java/be/kdg/trips/controllers/TripController.java