Merge origin/develop into develop

Conflicts:
	.gitignore