Merge branch 'master' into localBranchKG
Local branch commit before merging master
Check workbench
Merge branch 'master' into localBranchKG

Conflicts:
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
Included name in @Xmltype and removed namespace
Game Engine dev - Java coding standards changes
Commit before making main branch merge
Merge branch 'master' into localBranchKG
temp
Updating preview tool to recent spec change
Workbench
Workbench update
Merge branch 'localBranchKG'

Conflicts:
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
Merge branch 'master' into localBranchKG
Test Commit
Updating Test Game 5 & 6
Wokrbench update
Updating Test Game 5 & 6
Config History
Merge branch 'master' into localBranchKG