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
db:populate now calls db:seed
fixed access to /admin route
working on index
Merge branch 'develop' of github.com:Plazr/plazr_store into develop
implemented promotions to products; default DiscountTypes created on seed.rb
Merge branch 'feature/cp-promotion' into develop
merge with develop
fixed problem with getter attribute 'price' of a variant
fixed spec erros in products_controller_spec (refering to tabs in view)
checked boxes for promotions fixed; resolved spec failures
fixed a bug in Product#image
index and layout updates
Merge branch 'develop' into index_single_gabriel
pre layout update for single content
layout container updated! Started to put icons on session button
Big layout update. No header now. Topbar buttons fixed and session icons done.
filter link completed