Merge pull request #352 from ghost/master

Magento 1.7 New Core Files & Folders Disregarded