edit gemfile to rails 4.0.4
Merge branch 'master' into develop
update gem
fix geolocetion
fix zoom
Merge branch 'develop' of github.com:AstraL/IMC