first round of selectable fonts
Merge branch 'master' into editorfonts
Merge branch 'master' into editorfonts
add new fonts
Merge branch 'master' into editorfonts
first effort at a font preview
Merge branch 'editorfonts' into zoomify

Conflicts:
	website/templates/edit.html