UsersController#profile, commented code (seems to break the site signup)
added google geocoder
more work on Google Map
resolved merge conflict