social sign-in merge

Merged social sign-in branch to master. 
Please let me know if there are any issues!

Thanks,
Jessica