element-x-android

b194153b - Merge branch 'develop' into feature/bma/testEntryPoint