edit Gemfile
edit README
edit database.yml
Edit Gemfile(add gem'geokit-rails')
;
Merge branch 'develop'