school dependent modifications :D
cuz working in IT lessons
login over server
?
login via server
disconnect
?
database connection
Merge branch 'master' of https://github.com/Dakror/Arise.git

Conflicts:
	src/main/java/de/dakror/arise/Arise.java
	src/main/java/de/dakror/arise/settings/CFG.java
?
small tweak
world data and disconnect
applet lan parameter fix
ported spawn mechanism from website
city data
so many errors due to remodeling o_O
Merge remote-tracking branch 'upstream/master'
some work on stuffs
work on buildings
citylayer working to some extent
Merge remote-tracking branch 'upstream/master'