Merged social login

@yuma300 :sushi: !!