Merge branch 'localBranchKG'
Checkstyle changes to ConversationBubble.java, ThoughtBubble.java, Search.java, SearchAlgo.java, SimSYSGamePlatform.java, Challenge.java (old spec version), Reward.java.
Merge branch 'localBranchSean'
Character Update

Changed so character table shows characters standing smiling instead of
sitting at a desk
Game Engine Development - Changes related to the new Design pattern -
Adapter pattern
Game Engine - TestVariation 1 changes
Test Variation 1 development
Updated TestGame1
TestGame2 development
Added additional colors that are required for GameEngine
Game Engine Development - Corrected Compilation errors in the unused
files
Game Engine Development
Changes to several GameGeneratorCollection classes to support update of repository XML for new specification. Adjustments to GameElement, Prop, and GenericIntereaction as a result of those changes. Some changes to repository XML files.
Merge branch 'localBranchSean'
Merge branch 'master' into localBranchKG
Default