show block controlls when query variable is present
remove console log in oer/index
bugfixes to exercise plugin
Merge branch 'block-switch' into testing

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