fix math in exercises
Merge branch 'master' into testing

Conflicts:
	src/plugins/oer/exercise/lib/exercise-plugin.js
Merge branch 'testing' of github.com:oerpub/Aloha-Editor into testing