fix notes with unknown types
fix bug in note body display
Merge branch 'master' into testing

Conflicts:
	src/plugins/oer/note/lib/note-plugin.coffee
	src/plugins/oer/note/lib/note-plugin.js