.
。
Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
	src/com/chainton/pdmserver/threads/ClientMsgHandleThread.java