Refactor
Merge branch 'develop' of https://github.com/hopitio/e-com into develop