deleted Resources/.DS_Store
Merge branch 'develop'