Geocoding enabled - testing in heroku
Fixing conflicts

Conflicts:
	app/controllers/events_controller.rb
	app/models/event.rb
geolocation added
Merge branch 'master' of github.com:kennyszub/ftcalendar

Conflicts:
	app/models/event.rb
	solr/pids/development/sunspot-solr-development.pid