removed DS_Store file
Merge branch 'magento' into develop