Changed timeout values and added FbID

Now we upload the user's facebook ID along with the phone number
TImeout is more forgiving