renamed package -> working on server-client version
Merge branch 'master' of https://github.com/Dakror/Arise.git

Conflicts:
	src/main/java/de/dakror/arise/layer/CityLayer.java