Fix icons on file upload templates.
Replace image resizing with embedly.
Merge branch 'master' into stable
Remove delayed jobs.
Merge branch 'master' into stable
Remove delayed_jobs from Dockerfile