added google analytics
fixed tracking
Merge branch 'develop' into staging