Association changes

changes to GameControl, MapControl, Game, Inventory, Item,Location, Map,
Player, and Scene
Merge remote-tracking branch 'origin/master'