Workbench
Merge branch 'localBranchKG'

Conflicts:
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
Test Case 3 and fixes
Workbench
Test Game 6
Merge branch 'master' into localBranchKG