Merge branch 'chende'

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
修改同步开关的读取
Merge remote-tracking branch 'origin/master' into chenyan
修改打印log
Merge branch 'master' into chende

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