140703 .............
Merge branch 'master' of https://github.com/CCJY/servers

Conflicts:
	source/boost.Test/main.cpp