trip search + trip labels
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controller/HomeController.java
	src/main/java/be/kdg/controller/TripController.java
	src/main/java/be/kdg/listener/SpringApplicationListener.java
	src/main/java/be/kdg/model/Trip.java
	src/main/java/be/kdg/repository/TripRepository.java
	src/main/java/be/kdg/service/TripServiceImpl.java
	src/main/resources/messages/messages.properties
	web/WEB-INF/views/index.jsp