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