Typography fixes

Line height
Merge branch 'master' of https://github.com/studiokallbom/studiokallbom.se

Conflicts:
	app/styles/_typography.scss