Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
Merge branch 'master' into chende

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