Fix js in templates
Merge remote-tracking branch 'origin/master' into domoritz-new-editor

Conflicts:
	appengine/templates/base.html