edited to include google analytics and improved social buttons
Merge branch 'develop' into staging