add sponsors
	deleted:    app/views/admin/tickets/destroy.html.erb
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/routes.rb
	db/schema.rb

	deleted:    config/routes.rb