Merged sociallogin branch to master