Merge branch 'master' into freetext-mrq

mentoring/utils.py

@@ -31,7 +31,6 @@ import unicodecsv
 from cStringIO import StringIO
 from django.template import Context, Template
 from xblock.fragment import Fragment
-from workbench.scenarios import add_xml_scenario
 
 
 # Globals ###########################################################
@@ -93,10 +92,7 @@ def load_scenarios_from_path(scenarios_path):
     """
     Load all xml files contained in a specified directory, as workbench scenarios
     """
-    scenarios = get_scenarios_from_path(scenarios_path, include_identifier=True)
-    for identifier, title, xml_template in scenarios:
-        add_xml_scenario(identifier, title, xml_template)
-    return scenarios
+    return get_scenarios_from_path(scenarios_path, include_identifier=True)
 
 
 # Classes ###########################################################

setup.py

@@ -73,5 +73,5 @@ setup(
         'xblock.v1': BLOCKS,
         'xblock.light_children': BLOCKS_CHILDREN,
     },
-    package_data=package_data("mentoring", ["static", "templates", "public"]),
+    package_data=package_data("mentoring", ["static", "templates", "public", "migrations"]),
 )