Change Option into Choice.
Remove the stuff we don't need from the problemset editor.
Merge branch 'master' of github.com:UTMQ/utmq-core

Conflicts:
	app/views/authoring/problemset-edit.html