sync to development
sync with dev/staging
fixed broken submodule pointer
fixed broken submodule pointer
Merge pull request #481 from Pomax/staging

fixed broken submodule pointer
Merge pull request #480 from Pomax/production

fixed broken submodule pointer
Removing merge cruft accidentally left behind
updated friendlycode commit pointer
Merge remote-tracking branch 'upstream/development' into staging
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.
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 =)
added the source element attributes src and type, for compound video and audio elements
update friendlycode and make it point to mozilla/friendlycode instead of toolness/friendlycode.
Merge pull request #511 from Pomax/t508

added several attributes for the video element
Merge branch 't509' of git://github.com/Pomax/webpagemaker into Pomax-t509

Conflicts:
	webpagemaker/api/sanitize.py