Edit trip
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/model/Trip.java
	web/WEB-INF/views/trip/overview.jsp
Edit Member