Unstable state; need to merge from master

djangoapps/courseware/modules/template_module.py

@@ -6,6 +6,9 @@ from mitxmako.shortcuts import render_to_response, render_to_string
 from x_module import XModule
 from lxml import etree
 
+class ModuleDescriptor(XModuleDescriptor):
+    pass
+
 class Module(XModule):
     def get_state(self):
         return json.dumps({ })