changes to image modal for #280
fix image popovers
Merge branch 'dev' into image-plugin-updates
Merge remote-tracking branch 'origin/dev' into image-plugin-updates

Conflicts:
	src/plugins/oer/assorted/lib/image.coffee
	src/plugins/oer/assorted/lib/image.js
	src/plugins/oer/assorted/lib/link.coffee
	src/plugins/oer/assorted/lib/link.js
	src/plugins/oer/math/lib/math-plugin.coffee
	src/plugins/oer/popover/lib/popover-plugin.js
Merge branch 'image-plugin-updates' into block-image

Conflicts:
	src/plugins/oer/popover/lib/popover-plugin.js
fix image popovers
override default aloha cursor on block elements
fix some whitespace in note plugin
blockafy image plugin
refactor image add process
fix add image -> cancel workflow
wrap images in paragraphs
make dragging blocks not completely broken
Merge branch 'master' into block-image
Merge remote-tracking branch 'origin/master' into block-image
fix a few bugs in the image plugin
add a new... dropdown
fix adding an image via upload
wrap images in paragraphs
add hack to prevent semantic blocks from duplicating ids