Small changes due to merge with develop
Working on assets, merging with Nigel for sunspot
Working on assets, merging with Nigel for sunspot
Merge branch 'develop' into assets

Conflicts:
	db/seeds.rb
Edits to artwork_requests, merge with local develop-nick
Issue with solr
Added assets to artwork_requests
Added assets to artwork_requests
Merge branch 'assets' into develop

Conflicts:
	.gitignore
	db/schema.rb
	solr/default/data/index/segments.gen