Merging develop into master
Merge branch 'develop'
Don't need overridden show method
(48) specs for order quote tracking
Added orders_quotes join table
(48) Orders controller is all set
(48) Working on view. Chosen doesn't quote work atm
Merge branch 'release-2014-10-17'
Merge branch 'master' of github.com:AnnArborTees/softwear-crm
Merge branch 'develop'
Merge branch 'story-212'
Added api interface for imprintable variants
1 character
Merge branch 'story-212' into release-2014-10-17
Weight should be x.x not x
Merge branch 'release-2014-10-17' into story-48-nigel
Merge branch 'release-2014-10-17' of https://github.com/AnnArborTees/softwear-crm into story-213-david
Pulled from release 10/17
Added quote seed
Fixed