fix plugin
Merge branch 'master' of https://github.com/oneofthem/chat-xp

Conflicts:
	bin/AndroidManifest.xml
	bin/XMPPChatDemoActivity.apk
	bin/classes.dex
	bin/classes/com/demo/xmppchat/XMPPChatDemoActivity$4.class
	bin/classes/com/demo/xmppchat/XMPPChatDemoActivity.class
	bin/resources.ap_
	src/com/demo/xmppchat/XMPPChatDemoActivity.java