brol
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/messages_de.properties
	src/main/resources/messages_en.properties
	src/main/resources/messages_fr.properties
	src/main/resources/messages_nl.properties