Conflicts: problem_builder/mentoring.py problem_builder/questionnaire.py problem_builder/tests/integration/test_dashboard.py problem_builder/tests/integration/xml/assessment_2.xml problem_builder/tests/integration/xml/mcq_with_html_choices.xml problem_builder/tests/integration/xml/mrq_with_comments_1.xml problem_builder/tests/integration/xml/mrq_with_html_choices.xml problem_builder/tests/integration/xml_templates/assessment.xml problem_builder/v1/tests/xml/v1_upgrade_a_new.xml problem_builder/v1/tests/xml/v1_upgrade_b_new.xml run_tests.py test_requirements.txt
