Merge branch 'release/1.3' into develop
added .DS_Store to gitignore file
put new gitignore settings into action
Merge branch 'feature/removing-ds-store' into develop
1.3 -> 1.4
fixed conflict