updated .gitignore
Merge branch 'master' into t12555

Conflicts:
	.gitignore