adding features for social page
fix merge conflicts in gem and app