Merge branch 'analytics'

Conflicts:
.gitignore