use aloha-ephemera on semantic block ui elements
make semantic blocks out of divs we don't recognize
make generic blocks editable
add title handling to generic blocks
generic blocks support titles and are editable now
Merge remote-tracking branch 'origin/master' into ticket-495-new

Conflicts:
	src/plugins/oer/exercise/lib/exercise-plugin.coffee
	src/plugins/oer/exercise/lib/exercise-plugin.js
add data attributes to unknown block elements on save
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 remote-tracking branch 'origin/master' into ticket-495-new

Conflicts:
	src/plugins/oer/exercise/lib/exercise-plugin.js
	src/plugins/oer/semanticblock/lib/semanticblock-plugin.coffee
	src/plugins/oer/semanticblock/lib/semanticblock-plugin.js
Merge pull request #50 from oerpub/ticket-495-new

generic block element