Trip image working
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/be/kdg/controller/MemberController.java
	src/main/resources/messages/messages.properties
	src/main/resources/messages/messages_nl.properties