Merge branches 'staging' and 'master'
Added analytics
Merge branches 'master' and 'staging' into staging