added google analytics stuff
Merge origin/master