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

Conflicts:
	server/threadedServer/.settings/language.settings.xml