Merged choice and choice-freeform to one question type + added a remarks field to it.

To use the remarks option, add the 'remarks="Some text"' to the Additional checks.