Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdm/data/messages/enums/XMPPSecondType.java
。
Merge branch 'chenyan'
Merge branch 'master' into chende
增加5G
修改设置SSID密码之后的连接
修改2.4G和5G的查看设备和踢人等