modified:   app/controllers/admin/galleries_controller.rb
	modified:   app/controllers/admin/sponsors_controller.rb
	modified:   app/views/admin/galleries/_form.html.erb
	modified:   app/views/admin/sponsors/_form.html.erb
	modified:   config/routes.rb
	modified:   app/helpers/application_helper.rb
Merge remote-tracking branch 'upstream/master'