Remove removed files in .gitignore
Merge branch 'dev'