merge with fb_connect and delete UserInfo service

it's been a long time since we pushed to origin/master!