added social icons
Merge branch 'develop' into staging
Removed old facebook/twitter buttons