refactored
dMerge branch 'master' of github.com:ksergey/ironman

Conflicts:
	CMakeLists.txt
	src/common/message.hpp
	src/server/server.cpp