modify .gitignore

modify .gitignore
Merge branch 'dev'