update
Merge branch 'master' of https://github.com/Shadowss/TravianZ

Conflicts:
	GameEngine/Lang/en.php