Added slide/slideshow scaffolding
fixed merge with uploader