changes
Merge branch 'master' into Scripting

Conflicts:
	.idea/misc.xml