Sets Default problem to include Labels for Criteria and Options
Merge pull request #518 from edx/grady/ORA-674

Sets Default problem to include Labels for Criteria and Options