Merge branch 'typography-hyphenation' into devel

Conflicts:
	app/css/bible.css