Removed IDE settings directories
removed .idea and .settings from repo
Merge branch 'master' of https://github.com/dlicheva/Magento-local