staying logged in now
Merge branch 'master' into googapi7

Conflicts:
	app/controllers/places_controller.rb