temporary removed analytics code until fix
Merge branch 'master' into production