fixed gitignore
Merge branch 'master' into desktop/pgves/134