Google analytics code updates
Merge branch 'analyticsupdate' into develop