Merge branch 'master' into localBranchKG
Updating Test Game XML 2
Merge branch 'localBranchKG'

Conflicts:
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi