Added the analytics code
Merge branch 'develop' into staging