Social signin

Merging social-signin with master.