merging Zuluru commit 1325

("Change relation between game and game slot")