Merge branch 'analytics'

Conflicts:
.gitignore
Merge branch 'master' into kettle-deployment