Update gitignore
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	.gitignore