File to merge
Merge branch 'master' of https://github.com/OpenTenure/ot-android
Merging files
Merged
Merging
Solved Conflict
Tickets #85, #98, #99, #101, #111#