Merge branch 'with_canvas'
stop polling gameapi at end of a game
Merge branch 'master' into with_canvas