added size+color to product
Merge branch 'master' of github.com:Novamantic/ecommerce