add fbId and fbName to Game, update the searching feature
resolve merge conflicts