Cleaning up after troubleshooting on the production box, to make sure everyting is correctly checked into MASTER on github from the development box
Cleaning up after troubleshooting on the production box, to make sure everyting is correctly checked into MASTER on github from the development box
Merge branch 'experiment'
More work on facets and search.
 fixed utf8 encoding in messages
Merge branch 'staging'

Conflicts:
	blacklight-app/app/controllers/catalog_controller.rb
	blacklight-app/app/views/catalog/_home_text.html.erb
	blacklight-app/jetty/solr/conf/schema.xml