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

Conflicts:
	WebApp/src/main/resources/messages_nl.properties
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
views
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebApp/src/main/resources/messages_en.properties
	WebApp/src/main/resources/messages_nl.properties
i18n