edit profile

-unfinish
Merge remote-tracking branch 'origin/master'

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