Progress on social login, stuck on database errors
Merge branch 'master' into switham
various steve