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 Capistrano sunspot tasks
Added Capistrano sunspot tasks
moving sunspot_solr out of develop/production. If this configuration works, it's temporary as reindexing every deployment isn't practical.
Added assets to artwork_requests
Added assets to artwork_requests
Eager loading even in production
Merge branch 'assets' into develop

Conflicts:
	.gitignore
	db/schema.rb
	solr/default/data/index/segments.gen
Allow sunspot.yml in .gitignore
Create sunspot.yml
Remove production and canonical name from imprint methods

Create Imprintable Helper spec
Create find_sizes helper function
Add name and sizes available to imprintable show supplier information
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into develop-david

Conflicts:
	app/views/artwork_requests/_form.html.erb
	db/schema.rb