Added google analytics support
Merge branch 'develop' into staging