1.fixed settings.production
2.Show advert during trivia
Merge remote-tracking branch 'origin/trivia-only' into trivia-only