Merge branch 'hotfix-1.0.1'
removed .DS_Store
Merge branch 'hotfix-1.0.2' into develop