addtrip.jsp, trip.jsp, wijzigingen Trip model, service & controller, wijzgingen nl properties + homecontroller

rest volgt nog :)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/groepi/model/Trip.java
	src/test/java/be/kdg/groepi/service/TripServiceTest.java
	src/test/java/be/kdg/groepi/service/UserServiceTest.java
UserServiceTests en TripServiceTests aangepast