resume game activity
solving merge
bonoquizgame
Merge branch 'master' into alexis
Merge remote-tracking branch 'origin/alexis'