Simple server implementation added. World added. Some basic game objects added.
Spaces replaced with tabs
Updates from server branch merged
Merge branch 'client' into develop

Conflicts:
	Desktop/src/DesktopClientStarter.java
	Desktop/src/DesktopServerStarter.java
	Main/src/survive/client/SurviveClient.java
	Main/src/survive/server/SurviveServer.java