Merge branch 'master' of https://github.com/flygle/xmpp.git

Conflicts:
	androidxmpp/.classpath
	androidxmpp/AndroidManifest.xml
	androidxmpp/bin/AndroidManifest.xml
	androidxmpp/bin/classes/zhy/flygle/xmpp/MainActivity.class
	androidxmpp/src/zhy/flygle/xmpp/MainActivity.java

Signed-off-by: flygle <1341582089@qq.com>
Merge branch 'master' of https://github.com/flygle/xmpp.git

Signed-off-by: flygle <1341582089@qq.com>
Signed-off-by: flygle <1341582089@qq.com>
asdasd
describe of branch1
Merge branch 'master' of https://github.com/flygle/xmpp.git

Conflicts:
	androidxmpp/src/zhy/flygle/xmpp/MainActivity.java
Signed-off-by: flygle <1341582089@qq.com>
zzz