sync with dev/staging
fixed broken submodule pointer
Merge pull request #480 from Pomax/production

fixed broken submodule pointer
Removing merge cruft accidentally left behind
Merge pull request #488 from Pomax/staging

update to Staging. If working correctly, production will get updated. diff with development: no difference.
Merge remote-tracking branch 'upstream/staging' into production
Merge pull request #490 from Pomax/production

staging -> production update.
Fix #485, allowing published pages to be embedded in other sites.
Use a real jinja template for the editor; update friendlycode.

This takes advantage of the recent refactorings in friendlycode to make
the editor a "real" template, and not just a hacky find-replace on
friendlycode's index.html.

Next step is to actually move the thimble-specific files out of
friendlycode's repository and into webpagemaker.
Copied thimble-specific files from friendlycode into this repository.

Also made editor template refer to the copies in this repository.

Next step is to remove these files from the friendlycode repository.
Debug static file server delivers files w/o X-Frame-Options header now.

This actually enforces dev/prod parity, as our production servers don't
deliver static files with X-Frame-Options headers. It also allows us to
run friendlycode's unit test suite from the staticfiles directory, which
uses iframes.
Added thimble test suite.

This currently consists of the friendlycode test suite, and 3
tests for the thimble-specific typekit-ready plugin.
forgot to copy over header-gradient.png from the friendlycode repo.
dated	friendlycode.

Also made default editor page point at proper location of
default-content.html.
Merge pull request #500 from toolness/templatize-editor

Templatize the editor.
Merge pull request #492 from toolness/allow-embedding-of-published-pages

Fix #485, allowing published pages to be embedded in other sites.
Better rebasing of static URLs for learning projects.

Previously, we'd do a find/replace of 'static/', which meant that
URLs in learning projects like http://foo.com/static/blah.png got
converted to e.g. http://foo.com/http://thimble.org/static/blah.png.
Now we use a regexp with a negative lookbehind assertion to ensure that
we only rebase static URLs when they're not preceded with a '/'.
Merge pull request #484 from stenington/435-add-correct-s2r

Removing merge cruft from s2r project
added several attributes for the video element
added the audio element attributes to the sanitizer, so people won't lose their audio element =)