UserAuthOne
Merge branch 'OmniAuth'
userstuff