Beginning work for artwork requests
Commit to get up to date with develop since behind
Commit to get up to date with develop since behind
Merge branch 'develop' into artwork-request

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	config/routes.rb
	db/schema.rb
	db/seeds.rb
Commit to get up to date with develop since behind
Added sunspot and solr to gemfile
SO MANY SEEDS
The seeds, my god
Generated solr stuff. Might remove these files if I find out what they do.
Yeah, gonna remove solr cache stuff from git
Removed all those pesky solr files
Takin' down those solr files
Initial specs for search models
Specs for specific filter types
Search::Field now represents any searchable field in a model, added text filter
Super basic feature spec outline
Add Search::Query model
Somewhat prepare for actual content
Get the tests to the point where they can actually run (and all fail)
Make bundler stop complaining about duplicate gems