Commited dave
Merge branch 'dev' into Vala
remove all .DS_Store