Merge branch 'chende'
。
Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdmclient/LoadingActivity.java
	src/com/chainton/pdmclient/contstant/BroadcastActions.java
	src/com/chainton/pdmclient/sharecircle/PdmClientMessageHandler.java
添加设备关联表 delete字段
Merge branch 'chende'

Conflicts:
	src/com/chainton/pdmclient/view/custom/FragmentTitleView.java
修改