Merge branch 'hotfix/gemspec_fix' into develop
Merge branch 'develop' of github.com:Plazr/plazr_store into develop
Merge branch 'hotfix/gemspec' into develop
variant property values and variant categories working
resolver conflicts from merging develop with cp-variant_values_creation
implmented brand association to product
Merge branch 'develop' of github.com:Plazr/plazr_store into develop
created cukes for the new features; migration changes related to variant_property and variant_property_values; implemented the creation of different variants; corrected the specs to be accordingly to the mentioned changes
Merge branch 'develop' of github.com:Plazr/plazr_store into develop
started products indexing
added test/dummy/public/assets to gitignore, doesnt make sense pushing the files; added paperclip and a different version of cocaine to gemspec; developed the feature of adding files to variants; removed the table multimedia type
small change to improve edit action
small change to improve edit action
commentaries to some methods created
small fix to uploading images in variant's controller
Merge branch 'feature/cp-paperclip_on_variants' into develop
altered migrations to be accordingly modifications of multimedia table
Removed bugged migration
changed prototype to accept nested attributes for properties and variant_properties
added routes to products; changed populate rake task to create products with variants and variant properties with values; index and show for product;