Merge remote-tracking branch 'origin/master' into ticket-495-new

Conflicts:
	src/plugins/oer/semanticblock/lib/semanticblock-plugin.coffee
	src/plugins/oer/semanticblock/lib/semanticblock-plugin.js
fix broken merge in exercises
Merge branch 'ticket-495-new' into testing

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