update .gitignore file
Merge branches 'dev' and 'master'