Fixes model name for notes, fo issue #1388
Rendering comment content correctly, with HTML tags, for issue #489
update the field name for notes in the test
Merge branch 'gh-489' into staging