add facebook omniauth
added facebook omniauth
merged conflicts with github facebook branch
merged conflicts
merged conflicts