controllertestgevallen
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/be/kdg/teamf/Selenium/SearchTest.java
	src/test/java/be/kdg/teamf/Selenium/UserTest.java
	src/test/java/be/kdg/teamf/controller/TestTrip.java