Added Analytics
Merge branch 'dev'