regeneratedimages and changed permissions
updated config
ignoring images so staging and production don't share media
Merge branch 'develop' into staging
Merge branch 'staging'