Added slideshow to the toolbar
Merge branch 'master' into kingman