Merge branch 'develop'
Merge branch 'develop'
Make content modal small
Fix seeding
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into develop
Fixed navigation menus in imprintable show not working
trello url: https://trello.com/c/iABbKZCV
Fix bug where the imprintable index view would load hidden modals for every
single imprintable listed
Trello card: 136, url: https://trello.com/c/PdwqWDwr
Fix depreciation message in imprintable spec and
Merge branch 'hotfix-136' into develop

Conflicts:
	spec/features/imprintables_spec.rb
remove payments table from schema
Fix a bug where every imprintable would include duplicate colors (card #137)

Also add a scope to variants to restrict color ids based on size ids
Trello url: https://trello.com/c/89llLwox
Merge branch 'develop', remote-tracking branch 'origin' into hotfix-137
Task for importing imprintable data from google spreadsheet
Fix size/color grid displaying every color and size

Extend test suite
Merge branch 'develop' into develop-ricky
Fix basic info displaying all possible colors and not associated colors, expand spec
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