Some refactoring of general
Merge branch 'ms1-integration' of https://github.com/DComm2013Network/Server into ms1-integration

Conflicts:
	src/GeneralController.c