Merge branch 'master' into chende
限制流量
外网限制流量
Merge branch 'master' into chende
Merge branch 'master' into chende
.
Merge branch 'chenyan'
删除delqos方法
Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdm/data/messages/enums/XMPPSecondType.java
.