German messages
Merge branch 'dev' of git@github.com:icehockeystar/militaryshop.git into dev

Conflicts:
	src/main/webapp/WEB-INF/i18n/messages_de_DE.properties