Update editServerSet.tpl
Merge branch 'patch-12' of https://github.com/sempoi/TravianZ into sempoi-patch-12
update
Merge branch 'master' of https://github.com/Shadowss/TravianZ

Conflicts:
	Admin/Templates/config.tpl
	Admin/Templates/editServerSet.tpl