Merged
Merge branch 'master' of github.com:adrails/ecommerce