Update gitignore
Merge branch 'trunk'

Conflicts:
	.gitignore