Merge branch 'chende'
添加设备关联表 delete字段
Merge branch 'chende'

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