Merge branch 'localBranchKG'
Workbench.xmi update
Checkstyle updates to Search.java, SearchSpace.java.
Merge branch 'localBranchSean'
Workbench.xmi
Merge branch 'localBranchKG'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
Merge branch 'master' into localBranchKG