Finished feature
Merge branch 'develop' of github.com:HappyCarl/geotown.android into develop