version 211014
version 211014 v2
Merge branch 'master' of https://github.com/rowantyj/Jabber

Conflicts:
	Android/src/com/jabber/topicline/TopicLineFragment.java