getting ready for fetch
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/search.rb
	config/routes.rb
Merge remote-tracking branch 'upstream/master'
web service