Admin controller fix #2
solr
Merge branch 'TypeError_Rollback'

Conflicts:
	app/controllers/admin_controller.rb