Fixed markup.
Added a static helper to TextPropertView for rendering annotated text into an existing element.
Merge branch 'master' into ams