Removed slideshow, added iframe + iframedialog
Merge branch 'master' into kingman