Fix bug: include editor file handling.
Fix bug: include editor file handling.
Fix bug: include editor file handling.
Fix bug: choice text not outputted correctly.
Fix bug: functions copied from choice activity not renamed to 'enhancedchoice'