merge geo
Merge branch 'master' of https://github.com/vasspilka/LocalGrowth

Conflict in gemfile
Merge