fix line height cutting of j
Merge branch 'master' into coming

Conflicts:
	0.css