adding facebook oauth
adding facebook oauth
fixing merge conflicts
fixed merged conflicts
setup oauth
Merge in Facebook auth code