alternate method that does not rely on inline-block
Merge branch 'master' into note-label-alternate

Conflicts:
	src/scripts/modules/media/body/body.less
Merge pull request #295 from Connexions/note-label-alternate

Note/Exercise label works for long titles