v1.0 fixed 1
Merge branch 'master' of http://github.com/sinaptica/e-commerce