Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor

Conflicts:
	common/lib/xmodule/xmodule/js/src/problem/edit.coffee

cms/static/coffee/src/views/module_edit.coffee

@@ -55,7 +55,7 @@ class CMS.Views.ModuleEdit extends Backbone.View
   clickSaveButton: (event) =>
     event.preventDefault()
     data = @module.save()
-    data.metadata = @metadata()
+    data.metadata = _.extend(data.metadata, @metadata())
     $modalCover.hide()
     @model.save(data).done( =>
     #   # showToastMessage("Your changes have been saved.", null, 3)