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