Merge branch 'hotfix/content2'
keep all static content in cache for 1 week
keep images for 1 month
Merge branch 'hotfix/static-content' into develop