add ignore for DS_store files
Merge branch 'master' into LocationTabBranch