Comment Added.
Merge remote-tracking branch 'origin/social_login' into social_login. Merging in update like counts.