merge
Merge branch 'master' of
https://slayerrensky@github.com/flashbac/esd_projekt.git

Conflicts:
	server/threadedServer/.settings/language.settings.xml
Merge branch 'master' of
https://slayerrensky@github.com/flashbac/esd_projekt.git