Merge branch 'master' into chende

Conflicts:
	src/com/chainton/pdm/data/messages/enums/XMPPSecondType.java
.
修改
。
Merge branch 'chenyan'
Merge branch 'master' into chende