Improved forms and added expected duration to question content tab

Improved: question edit and add forms. Also now only 1 form is used.
Improved: set add and edit forms.

Added: "Expected duration ... minutes" to content tab of questions
Merge branch 'master' of git@github.com:ucam-cl-dtg/urop-2013-questions.git