remove .DS_Store and .idea/
Merge branch 'master' into dev