Make content modal small
Stashing payment changes to work through bugs
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into payments

Conflicts:
	db/schema.rb
Task for importing imprintable data from google spreadsheet
Merge branch 'develop' into develop-ricky
remove new tag from imprintables/basic_info view spec
going to apply stash
Adding coordinates and imprintable data
Merge branch 'develop-ricky' into develop
Added n/a to sizing group
Added n/a to sizing group
Merge branch 'develop' into develop-ricky
Added supplier info, updated rake task to populate supplier details
Make gitignore ignore Solr stuff.
Separate timeout modal from content modal
Rpsec, reworked imprintable layout
Merge branch 'adding-supplier-info' into develop-ricky

Conflicts:
	lib/tasks/imprintables.rake
Add a safe framework for the content modal
Change development timeout back to 2 billion!
Merge branch 'develop-nigel' into develop