[?!] update :p
Merge branch 'master' of https://github.com/sinaptica/e-commerce