publish/delete/subscribe secured+i18n
publish/delete/subscribe secured+i18n Repush
publish/delete/subscribe secured+i18n rerepush
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/resources/message.properties
	WebApp/src/main/resources/message_nl.properties
	WebApp/src/main/webapp/WEB-INF/views/tripHeaderView.jsp
	WebApp/src/test/java/be/kdg/trips/TripTest.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/java/be/kdg/trips/controllers/TripController.java
	WebApp/src/main/resources/messages_en.properties
	WebApp/src/main/resources/messages_nl.properties
	WebApp/src/main/webapp/WEB-INF/views/users/createTripView.jsp
	WebApp/src/test/java/be/kdg/trips/TripTest.java
28/02 12:19