fix
Merge branch 'master' of https://github.com/liqites/magento-new-website