first draft
first draft clean up
Merge pull request #1 from CharityClear/Magento-1.7

Magento 1.7