Conflict .xmi
Setting Profile Photo in Left Column
Change in Character.java to remove abstract designation.
Merge branch 'localBranchKG'

Conflicts:
	Game Generator/.gitignore
	Game Generator/Office, Classroom/learningTaxonomy.png
	Game Generator/Office, Classroom/template.xml
	Game
Generator/gamexml/TestGame1_Variations/BackGround-Color-ChangeV1.2.xml
	Game Generator/gamexml/TestGame1_Variations/Button-ChangeV1.4.xml
	Game Generator/gamexml/TestGame1_Variations/Button-Color-ChangeV1.1.xml
	Game Generator/gamexml/TestGame1_Variations/Color-Changev1.2.xml
	Game Generator/gamexml/TestGame1_Variations/FadeIn_FadeOut_Change.xml
	Game Generator/gamexml/TestGame1_Variations/FadeIn_FadeOut_Test.xml
	Game Generator/gamexml/TestGame2_Variations/Animation-Change.xml
	Game Generator/gamexml/TestGame2_Variations/Background-Change.xml
	Game Generator/gamexml/TestGame2_Variations/Button-Color-ChangeV1.2.xml
	Game
Generator/gamexml/TestGame2_Variations/Button-Location-ChangeV1.4.xml
	Game Generator/gamexml/TestGame2_Variations/Random_Colors_Change.xml
	Game Generator/gamexml/TestGame2_Variations/TestGame2-Final.xml
	Game
Generator/gamexml/TestGame3_Variations/BackGround-Color-ChangeV1.3.xml
	Game Generator/gamexml/TestGame3_Variations/ButtonColor_Change.xml
	Game
Generator/gamexml/TestGame3_Variations/FadeIn_FadeOut_TimeChange.xml
	Game Generator/gamexml/TestGame3_Variations/Image-ChangeV1.3.xml
	Game Generator/gamexml/TestGame3_Variations/Image_LocationChange.xml
	Game
Generator/gamexml/TestGame3_Variations/InformationBox-ColorChangeV1.3.xm
l
	Game
Generator/gamexml/TestGame3_Variations/InformationBox_Location_Change.xm
l
	Game Generator/gamexml/TestGame3_Variations/TestGame3-Final.xml
	Game Generator/gamexml/TestGame4_Variations/Animation_TimeChange.xml
	Game
Generator/gamexml/TestGame4_Variations/BackGround-Color-ChangeV1.4.xml
	Game Generator/gamexml/TestGame4_Variations/Button-ChangeV1.4.xml
	Game Generator/gamexml/TestGame4_Variations/Button_LocationChange.xml
	Game Generator/gamexml/TestGame4_Variations/Color-ChangeV1.3.xml
	Game
Generator/gamexml/TestGame4_Variations/InformationBox-ChangeV1.4.xml
	Game Generator/gamexml/TestGame4_Variations/TestGame4-Final.xml
	Game Generator/gamexml/TestGame5_Variations/Background_ChangeV1.0.xml
	Game Generator/gamexml/TestGame5_Variations/Button_Color_Change.xml
	Game Generator/gamexml/TestGame5_Variations/Button_Location_Change.xml
	Game Generator/gamexml/TestGame5_Variations/FadeIn_FadeOut_Change.xml
	Game Generator/gamexml/TestGame5_Variations/Image_Change.xml
	Game Generator/gamexml/TestGame5_Variations/TestGame5-Dropbox.xml
	Game Generator/gamexml/TestGame5_Variations/TestGame5-Final.xml
	Game Generator/gamexml/TestGame5_Variations/Walking_Style_Change.xml
	Game Generator/gamexml/TestGame5_Variations/Walking_Time_Change.xml
	Game Generator/src/edu/utdallas/gamePlayEngine/GamePlayEngine.java
	Game Generator/src/edu/utdallas/gamePlayEngine/TestGameEngine.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/controller/GameController.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/controller/GameState.java
	Game Generator/src/edu/utdallas/gamePlayEngine/controller/Message.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/controller/MessageReward.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/controller/MessageType.java
	Game Generator/src/edu/utdallas/gamePlayEngine/menuFrame.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Act.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/ActBoundary.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/ActControl.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/ActGameElement.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Action.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Animation.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Audio.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Backdrop.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Challenge.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/ChallengeStructure.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Color.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/DeclarationsInitializati
ons.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/EndOfScreen.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Event.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/EventName.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/GameCharacter.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/GameConstants.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/GameElement.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/GameElementBoundary.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/GameElementControl.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/GameElementIdentifier.ja
va
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/GameElementTimer.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/GameModel.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/GameModelBoundary.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/GameModelControl.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/GamePlay.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/GameState.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/GenericInteraction.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Graphic.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Identifier.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/If.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/InformationBox.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Interactions.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Location.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Music.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/NewScreen.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/NonPlayer.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Player.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/PlayerBoundary.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/PlayerControl.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Profile.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Prop.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Props.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Quiz.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/ReadBehavior.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Reward.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/RewardBoundary.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/RewardControl.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Scene.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/SceneBoundary.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/SceneControl.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Screen.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/ScreenBoundary.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/ScreenControl.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/ScreenDescription.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Size.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/SoundEffect.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/StartOfScreen.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/model/StemDescription.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/StemOption.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/StemQuestion.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Time.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Timer.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Type.java
	Game Generator/src/edu/utdallas/gamePlayEngine/model/Util.java
	Game Generator/src/edu/utdallas/gamePlayEngine/swingx-1.6.1.jar.zip
	Game
Generator/src/edu/utdallas/gamePlayEngine/swingx-1.6.1.jar/swingx-1.6.1.
jar
	Game Generator/src/edu/utdallas/gamePlayEngine/view/BlueSky.png
	Game
Generator/src/edu/utdallas/gamePlayEngine/view/Character1StandClosed.png
	Game Generator/src/edu/utdallas/gamePlayEngine/view/CollegeBuilding.png
	Game
Generator/src/edu/utdallas/gamePlayEngine/view/ConversationBubble.java
	Game Generator/src/edu/utdallas/gamePlayEngine/view/CustomDialog.java
	Game Generator/src/edu/utdallas/gamePlayEngine/view/FadingButtonTF.java
	Game Generator/src/edu/utdallas/gamePlayEngine/view/GameView.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/view/GameViewBoundary.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/view/GameViewControl.java
	Game Generator/src/edu/utdallas/gamePlayEngine/view/GameViewFrame.java
	Game Generator/src/edu/utdallas/gamePlayEngine/view/ImagePanel.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/view/JPanelWithBackground.java
	Game
Generator/src/edu/utdallas/gamePlayEngine/view/Random_Colors_Change.xml
	Game Generator/src/edu/utdallas/gamePlayEngine/view/RoundedPanel.java
	Game Generator/src/edu/utdallas/gamePlayEngine/view/Test.java
	Game Generator/src/edu/utdallas/gamePlayEngine/view/bkgrnd.png
	Game Generator/src/edu/utdallas/gamePlayEngine/view/black-BG.jpg
	Game Generator/src/edu/utdallas/gamePlayEngine/view/blue_bg.png
	Game
Generator/src/edu/utdallas/gamePlayEngine/view/char1_StandSmileClosed.pn
g
	Game
Generator/src/edu/utdallas/gamePlayEngine/view/char1_WalkRBehind.png
	Game Generator/src/edu/utdallas/gamePlayEngine/view/char1_WalkROpen.png
	Game
Generator/src/edu/utdallas/gamePlayEngine/view/char2_StandClosed.png
	Game
Generator/src/edu/utdallas/gamePlayEngine/view/char2_WalkRBehind.png
	Game
Generator/src/edu/utdallas/gamePlayEngine/view/char2_WalkRClosed.png
	Game
Generator/src/edu/utdallas/gamePlayEngine/view/char9_StandClosed.png
	Game Generator/src/edu/utdallas/gamePlayEngine/view/darkGrey.jpg
	Game Generator/src/edu/utdallas/gamePlayEngine/view/lightGrey.jpg
	Game Generator/src/edu/utdallas/gamePlayEngine/view/medGrey-BG.jpg
	Game Generator/src/edu/utdallas/gamePlayEngine/view/white-BG.jpg
	Game Generator/src/edu/utdallas/gamegenerator/Character/Profile.java
	Game Generator/src/edu/utdallas/gamegenerator/GameGenerator.java
	Game Generator/src/edu/utdallas/gamegenerator/Layers.java
	Game
Generator/src/edu/utdallas/gamegenerator/LearningAct/Character/Movement.
java
	Game Generator/src/edu/utdallas/gamegenerator/Locale/Locale.java
	Game Generator/src/edu/utdallas/gamegenerator/Theme/Theme.java
	Game
Generator/src/edu/utdallas/gamegenerator/old/Challenge/Challenge.java
	Game
Generator/src/edu/utdallas/gamegeneratorcollection/ComponentCreation/Ass
et.java
	Game
Generator/src/edu/utdallas/gamegeneratorcollection/ComponentSelection/In
putWizard.java
	Game Generator/src/edu/utdallas/gamewizard/GameTemplate.java
	Game Generator/src/edu/utdallas/gamewizard/Test.java
	Game Generator/src/edu/utdallas/gamewizard/Wizard.java
	Game Generator/src/edu/utdallas/old/testfiles/MainTestChallenge.java
	Game Generator/src/edu/utdallas/old/testfiles/MainTestCharacter.java
	Game Generator/src/edu/utdallas/old/testfiles/Test.java
	Game Generator/src/edu/utdallas/old/testfiles/TestObjects.java
	Game Generator/src/edu/utdallas/previewtool/Error/GameErrorChecker.java
	Game
Generator/src/edu/utdallas/previewtool/View/CharacterProfileWindow.java
	Game Generator/src/edu/utdallas/previewtool/View/ScenePanel.java
	Game Generator/src/edu/utdallas/sharedfiles/Structure/Structure.java
	Game Generator/src/org/jdesktop/animation/timing/Animator.java
	Game
Generator/src/org/jdesktop/animation/timing/TimingEventListener.java
	Game Generator/src/org/jdesktop/animation/timing/TimingSource.java
	Game Generator/src/org/jdesktop/animation/timing/TimingTarget.java
	Game
Generator/src/org/jdesktop/animation/timing/interpolation/Interpolator.j
ava
	Game
Generator/src/org/jdesktop/animation/timing/interpolation/LinearInterpol
ator.java
	Game Generator/timingframework-1.0.jar
Merge branch 'master' into localBranchKG