bug fix
Merge branch 'staging'
google analystics
Merge branches 'master' and 'develop' into develop
Merge branches 'develop' and 'staging' into staging