Merge branch 'master' of ssh://github.com/securekey/openmidaas-android-app