changes from valerka - map
git update
removing obsolette gems and files
removing finalization removing and preparing for rails 4.0
removing finalization removing and preparing for rails 4.0
Merge branch 'master' of github.com:phgrey/places

Conflicts:
	Gemfile.lock
	app/controllers/application_controller.rb
	app/controllers/cities_controller.rb
	app/models/city.rb
	config/database.yml
	config/initializers/devise.rb