Basic server communication created
Merge branch 'master' of https://github.com/ZimonD/ContextCG7

Conflicts:
	src/server/src/main/java/disastercontrol/entity/EntityFactory.java