refs #493: exercise/solution now converts
Merge branch 'master' into ticket493++

Conflicts:
	rhaptos/cnxmlutils/xsl/aloha-to-html5-pass03-nested-headers.xsl
Merge pull request #16 from Connexions/ticket493++

refs #493: exercise/solution now converts