delete ds store files
Merge branch 'dev-pm14' into dev