server game logic now using the new map
Merge branch 'master' of https://github.com/rbellido/Project

Conflicts:
	redesigned/modules/server_game_logic.h
Merge branch 'master' of https://github.com/rbellido/Project
cleaned up some printf statements