Updated ignore
Merge branch 'release-dev' into release-design
Merge branch 'release-dev'

Conflicts:
	.gitignore
Merge branch 'release-dev' into release-design
Merge branch 'release-dev' into release-design
Merged