Merge branch 'hotfix/gemspec'
Merge branch 'develop', remote-tracking branch 'origin' into feature/cp-promotion
DiscountTypes CRUD removed; images created on product with populate; DiscountType are created by default in seed
implemented promotions to products; default DiscountTypes created on seed.rb
Merge branch 'feature/cp-promotion' into develop
merge with develop