Merge branch 'master' into stable

Conflicts:
	app/models/request.rb
	app/views/travel_sponsorships/index.html.haml
	config/site.example.yml
	lib/travel_support/version.rb
	spec/features/requests_list_spec.rb