update Gemfile.lock
Merge branch 'master' of heroku.com:imi-maps
update Gemfile.lock
Merge branch 'master' of heroku.com:imi-maps
small label changes
resolve merge conflicts