Added FB token to the user model
Merge branch 'master' into user