Lighthouse #90
Merge branch 'master' of https://github.com/OpenTenure/ot-android