Merge branch 'cdmiller-data-games/master'
Fix conflict in versin date with Flash/ShipOdyssey/src/odyssey/ShipOdyssey.mxml
Merge branch 'cdmiller-data-games/master'
Fix Conflict: Flash/ShipOdyssey/src/odyssey/ShipOdyssey.mxml by throwing away old version.
Merge branch 'origin/master'
fix Conflicts in Flash/ShipOdyssey/src/odyssey/ShipOdyssey.mxml by using latest version (throw away old version)
Inference Games: add DG logging and fix DG data bug, v.2013.09.03
Now logs start of round
Fixes bug where last round of previous game had new game number.
InfGames: Replaced expert avatar with new art. Replaced player avatar with proxy art.
Avatars now have 'emotions', based on whether they hit or missed their guess.
Merge branch 'seg-srri-umass-tp-data-games/master'
Inference Games: update DG when results of round are displayed, not after.
Splits endOldRound() into closeRoundData() and resetPlayers() since sometimes we don't want to do both.
Merge branch 'cdmiller-data-games/release-branch'
Merge branch 'seg-srri-umass-tp-data-games/release-branch'
Merge branch 'seg-srri-umass-tp-data-games/master'
Inference Games: Added functionality to the level select screen.
Changed the singleton naming convention from Class.CLASS to Class.instance, for consistancy.
Inference Games: Added 3 classes that were forgotten at last checkin (MovieClipButton, RadioButton, RadioBtnGroup)
Fixed issue with expert re-appearing when end game was clicked. Moved DataCannon speed variable into data cannon.
Inference Games: Added a "Debug Console". Type the word "debug" at any time to get to it. To write new commands for it, use the DebugConsoleSWC.as class.
Merge branch 'MikeSalyh-TP-data-games/master'