fix placeholder text for notes
fix placeholder text for semantic blocks
fix troubleshooting code in semantic blocks
Merge branch 'ticket-495-new' into testing

Conflicts:
	src/plugins/oer/semanticblock/lib/semanticblock-plugin.coffee
	src/plugins/oer/semanticblock/lib/semanticblock-plugin.js
Merge branch 'ticket-364' into testing

Conflicts:
	src/plugins/oer/note/lib/note-plugin.coffee
	src/plugins/oer/note/lib/note-plugin.js
fix a thing in semanticblocks
fix a thing in semantic blocks