take 1 Merge branch 'develop' into staging
changed image url
no clue
fixed conflict
syntax
Merge branch 'develop' into staging
Merge branch 'staging'