Openfire双连接
Merge branch 'master' of https://github.com/fywb251/bsl_impc_android

Conflicts:
	cube-android/AndroidManifest.xml
	cube-android/gen/com/csair/impc/R.java
	cube-android/src/com/foreveross/chameleon/URL.java
	cube-android/src/com/foreveross/chameleon/push/cubeparser/PushContentParser.java
双连接
Merge branch 'master' of https://github.com/fywb251/bsl_impc_android