Add social_auth
Merge branch 'master' into social-auth
Add Custom User
Merge branch 'social-auth'