Re-added iframedialog
Merge branch 'master' into kingman