Merge branches 'develop' and 'staging' into staging
Merge branch 'develop' into staging
removed gif formatting.