Getting workspace ready for check style update
Merge branch 'localBranchKG'

Conflicts:
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
Added adapter wrapper classes
Added adapter wrapper classes
TestGame3
Added public getter setter for colorname to access it inside game engine
Changes in Character.java and Option.java to shift reward elements from String placeholders to instances of the Reward class. Updates in Locale java to build challenges more accurately. Checkystle changes in SearchAlgo.java. Moved the non-current specification of Challenge (related to the XML repository files, not the gamespec) to generatorcollection.gamecomposition package.
Merge branch 'localBranchSean'
Checkstyle changes to Color.java after merging updated file.
Metadata settings
Merge branch 'master' into localBranchKG

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