deploy script
embeddable layout with /:id/embed
Merge branch 'refs/heads/master' into gh-pages

Conflicts:
	deploy
deploy