Merge branch 'feature/dhm/cms-settings' of github.com:MITx/mitx into feature/dhm/cms-settings

cms/djangoapps/contentstore/tests/test_course_settings.py

@@ -9,7 +9,7 @@ from xmodule.modulestore import Location
 from cms.djangoapps.models.settings.course_details import CourseDetails,\
     CourseSettingsEncoder
 import json
-from common.djangoapps.util import converters
+from util import converters
 import calendar
 
 # YYYY-MM-DDThh:mm:ss.s+/-HH:MM

cms/static/js/template_loader.js

@@ -5,7 +5,7 @@
 	if (typeof window.templateLoader == 'function') return;
 	
     var templateLoader = {
-      templateVersion: "0.0.9",
+      templateVersion: "0.0.11",
       templates: {},
       loadRemoteTemplate: function(templateName, filename, callback) {
         if (!this.templates[templateName]) {