Added user schema fields and a game schema grunt cli dependency
fixed errors to user schema
fixed merge