Merge pull request #43 from oerpub/fix-demos

fix font awesome
Factor uploadImage into plugin where it can be overriden.

Conflicts:

	src/plugins/oer/assorted/lib/image.coffee
	src/plugins/oer/assorted/lib/image.js
Merge branch 'oerpub-ticket425' into testing