passenger error action 2
Merge branch 'newbranch'

Conflicts:
	app/controllers/sponsors_controller.rb