Fixed .gitignore file path
Merge branch 'dev'