remove game_id on destroy
Merge remote-tracking branch 'upstream/master'