new analytics
Merge branch 'master' into web/odi/activities/15