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