Merge branch 'chende'

Conflicts:
	src/com/chainton/pdmserver/db/DBOpenHelper.java
	src/com/chainton/pdmserver/db/services/RelatedDeviceDBService.java
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
修改
修改
Merge branch 'chende'

Conflicts:
	src/com/chainton/pdmserver/db/DBOpenHelper.java
	src/com/chainton/pdmserver/db/services/RelatedDeviceDBService.java
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
修改
Merge branch 'master' into chende

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