Logging cleanup
Merge branch 'website_rebase' of github.com:jirafe/magento-extension into website_rebase