Added user schema fields and a game schema grunt cli dependency
fixed errors to user schema
fixed merge
added default player number
Merge remote-tracking branch 'origin/kenny' into spencer