Merge remote-tracking branch 'origin/development' into general
Doxygen comments
more comments
Added comments to chat.c
Server utils docs
Inbound switchboard comments done
Merge branch 'docs' of https://github.com/DComm2013Network/Server.git into docs
Move timer docs
Merge branch 'docs' of https://github.com/DComm2013Network/Server.git into docs
Inbound didn't seem to commit
outbound switchboard comments
game-utils comments
updated gameplay controller to remove compiler warnings
UI doxy comments
keep-alive comments
Merge branch 'docs' of https://github.com/DComm2013Network/Server into docs
Doxygenized Startup.c
Small comment edits
Merge branch 'docs' into development

Conflicts:
	src/GeneralController.c
	src/game-utils.c