analytics added
Merge branch 'develop' into staging
fixed div errors
Merge branch 'develop' into staging