Merge conflicts
Merge branch 'master' of https://github.com/OpenTenure/ot-android
F85 Handle ID type and number & F84 - Delete Person