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: 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.