Merge branch 'chende'

Conflicts:
	src/com/chainton/pdmserver/service/SwitchService.java
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
关联设备增加mac
Merge branch 'chende'

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
Merge branch 'chenyan'
注销，关联设备删除
Merge branch 'chende'

Conflicts:
	src/com/chainton/pdmserver/sharecircle/PdmServerMessageHandler.java
Merge remote-tracking branch 'origin/master' into chenyan