More fixes

Highlight correct answer
Tidy up delete question
Allow changing of question type
Merge branch 'master' of https://github.com/OxfordCS2014BestestProject/InstantFeedback