Merge branch 'MtServer' Remove example files.

Conflicts:
	include/basicserver.h
	src/basicserver.cpp