Merge branch 'master' into develop
Google analytics code updates
Merge branch 'analyticsupdate' into develop