use data-label attribute instead of data-type
changes dropdown to only include the caret
change the config field names to be clearer

or at least easier to search and replace later
bind DnD drop and drag zones once the editable is focused
Merge branch 'master' into use-data-label-instead-of-type

Conflicts:
	src/plugins/oer/semanticblock/lib/semanticblock-plugin.js
conditionally show block labels
Merge remote-tracking branch 'origin/master' into use-data-label-instead-of-type

Conflicts:
	src/plugins/oer/semanticblock/lib/semanticblock-plugin.coffee
	src/plugins/oer/semanticblock/lib/semanticblock-plugin.js
fix figure loading issue
add figure plugin to build profile
Merge pull request #130 from oerpub/use-data-label-instead-of-type

use data-label attribute instead of data-type