fix .gitignore
Merge branch 'develop'