solr production

Conflicts:
	app/views/admin/cards/_form.html.erb
	solr/development/data/index/segments.gen