Merge branch 'master' into tumblr

Conflicts:
	web/index.html