Add omni-auth-facebook to gemfile
Add devise with User and Omniauth FB; update views with NAV elements
Small fix to User model and devise.rb to ensure FB login works
Add relationship specs for User and User factory; add relationships in User.rb; update application.rb with fix to default to new Rails behavior with raising an error if an invalid locale is passed
Merge conflict fix