Updated translation
Some server work
Merge remote branch 'origin/master'

Conflicts:
	Game Server/res/lang/de.json