Added mercury editing capability
Merged gem file
Merge branch 'master' of github.com:kimenye/totomama-rails
Changed inclusion of google maps gem css and javascript