fixed analytics
Merge branch 'staging'