Chat activity developing.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/netas/xmpp/activity/ChatActivity.java