analytics testing progress
Merge branch 'dev'
More merging between me and nathan