Merge branch 'ms1-integration' into development
Version 1.0 release
Merge branch 'ms2-integration' into general
Redid counting logic
Merge branch 'development' of https://github.com/DComm2013Network/Server into general

Conflicts:
	src/Server.h
I don't even know..
Merge branch 'general' of https://github.com/DComm2013Network/Server into general

Conflicts:
	src/GeneralController.c
Hopefully fixed
Started rehashing force-move logic for game start and end
Logic 'fixes' needs test
Merge branch 'general' into ms2-integration
writeIPC change
General refactoring and cleaning
Merge branch 'general' into ms2-integration
Server Control Panel added
Naming convention overhaul for packets