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

Conflicts:
	Admin/Templates/village.tpl