Fixed height normalisation
Oops.
Merge branch 'master' into gh-pages

Conflicts:
	js/itemlist.js