Removed iframedialog completely
Merge branch 'master' into kingman