If player floor incorrect, now shows player number in error message
Revised keep-alive and general bug fixes
Removed check in general controller
Fixed over-trusting play floor setting
Changed code so that packet 11 (all player pos update) will only be sent
when a ptype 11 is received through ipc sockets
Fixed makefile
Removed movement packet debugs.
They were really annoying...
Merge branch 'ms1-integration' of https://github.com/DComm2013Network/Server into ms1-integration
Added update on tick
Merge branch 'general' into ms2-integration

Conflicts:
	src/GeneralController.c
Merge branch 'gameplay' into ms2-integration

Conflicts:
	src/GameplayController.c
	src/InboundSwitchboard.c
	src/Server.h
	src/Startup.c
Upgraded DEBUG macro
Removed over-sending of packet 11
Merge remote-tracking branch 'origin/ms2-integration' into general

Conflicts:
	src/GeneralController.c
fixed sockets, added comments