fix exercise and solution type selectors
Merge branch 'bugfix-461' into testing

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