Merge branch 'update_otr' of https://github.com/aelmahmoudy/xabber-android into aelmahmoudy-update_otr

Conflicts:
	app/otr4j