Merge branch 'ms1-integration' into development
Version 1.0 release
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