Updated .gitignore file.
Merge branch 'master' into dev