Merge branch 'master' of github.com:svenkubiak/Rudeltippen

Conflicts:
	conf/messages.de
Merge branch 'master' of github.com:svenkubiak/Rudeltippen

Conflicts:
	conf/messages.de