Fix git rm  with spaces in file names
Merge branch 'dev' into prod