iframe logic
Merge branch 'master' of github.com:swgreen/eyebrowse-2