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