Merge branch 'feature/queued_upload' into develop
Merge branch 'master' into develop
Admins can use HTML in slideshow 'custom title' field.
Merge pull request #7 from wamberg/feature/html_slide_lede

Feature/html slide lede