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

Conflicts:
	src/main/java/be/kdg/controller/MemberController.java
	src/main/java/be/kdg/dto/MemberDetailDTO.java
	web/WEB-INF/spring/persistence-context.xml
	web/WEB-INF/views/trip/masterpage_tripmenu.jsp
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controller/MemberController.java
	src/main/java/be/kdg/dto/MemberDetailDTO.java
	web/WEB-INF/spring/persistence-context.xml
	web/WEB-INF/views/trip/masterpage_tripmenu.jsp
SightsPoints