Merge branch 'map' into gui

Conflicts:
	src/server.cpp
	src/serverlogic.cpp
	src/serverlogic.hpp