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

Conflicts:
	.gitignore
Merge branch 'develop'