Add google analytics
Merge branch 'site_fixes' into develop