Merge branch 'feature-newUpload'
new upload of Magento core
Merge branch 'feature-newFeature2' into feature-newUpload