Improve demo styles
Merge branch 'master' into gh-pages
Make the demo run only on the demo iFrame (in case there are other iFrames in the page)
Merge master