Merge branch 'master' of github.com:washing0432/MyServer

Conflicts:
	SyncServer.v11.suo