Merge b3e2c88 & bca24cb

Issue #1306224 by djdevin | stella: Added ability to re-order multichoice answers in UI.