Fix login
Minor change
Merge branch 'master' into user-display-name+settings
Merge pull request #241 from tispratik/fix_auth

Fix login
Merge pull request #243 from kimardenmiller/user-display-name+settings

Merge branch 'master' into user-display-name+settings
Terms of use and Privacy Policies
Merge pull request #244 from kimardenmiller/terms-of-use-and-privacy

Terms of use and Privacy Policies
Several tweaks from user feedback
Merge pull request #245 from kimardenmiller/user-feedback-fixes

Several tweaks from user feedback
Fix active admin error
Merge pull request #246 from tispratik/fix_active_admin

Fix active admin error
Revert Pratik's changes from master
Merge pull request #247 from kimardenmiller/revert-active-admin-changes

Revert Pratik's changes from master
New User now saving by setting email to ""
New User now saving cleanup
Allow email to be null
Fixed Gravatar null email
Fixed FB User saves, require provider & uid
Tests for the Auth controller
Merge pull request #248 from kimardenmiller/fix-FB-user-save-fail-on-email-required

Fix fb user save fail on email required