Metadata settings
Metadata
Ignore commit
Merge branch 'master' into localBranchKG

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
Refactorin GameGenerator - GameGeneratorCollection
Merge branch 'localBranchKG'
Workbench.xmi update
Merge branch 'localBranchSean'
Checkstyle changes to ConversationBubble.java, ThoughtBubble.java, Search.java, SearchAlgo.java, SimSYSGamePlatform.java, Challenge.java (old spec version), Reward.java.