Pass element to the uploadImage call.
Merge pull request #47 from oerpub/ticket-369

allow nesting block elements
Merge pull request #46 from oerpub/ticket-498

only allow plain text inside notes and quotations
Merge pull request #39 from oerpub/ticket466

Ticket466
Merge pull request #45 from oerpub/oerpub-ticket425

Factor uploadImage into plugin where it can be overriden.
use aloha-ephemera on semantic block ui elements
make semantic blocks out of divs we don't recognize
Merge branch 'ticket-495' into testing

Conflicts:
	src/plugins/oer/assorted/lib/image.js
	src/plugins/oer/exercise/lib/exercise-plugin.coffee
	src/plugins/oer/exercise/lib/exercise-plugin.js