enable video plugin
working on fonts
Revert "working on fonts"

This reverts commit 405d28f3f60a80404a1a7df5f5d89e6d72cc6c4c.
add icon to media plugin
Merge branch 'master' into video-plugin

Conflicts:
	scripts/configs/aloha.coffee
include figure plugin
change media icon
Merge pull request #23 from oerpub/video-plugin

Video plugin
avoid rangeError by setting endOffset to 1 and calling collapse()
Merge remote-tracking branch 'origin/master' into fix-range-errors
Merge pull request #29 from oerpub/fix-range-errors

Fix range errors on book change.
Merge remote-tracking branch 'origin/master' into undoredo