Merge branch 'master' into develop

Conflicts:
	.idea/workspace.xml