Update .gitignore file.
Merge branch 'refs/heads/develop_matjazsu'