Merge branch 'cdodge/meta-data-cms-editing' of github.com:MITx/mitx into...

Merge branch 'cdodge/meta-data-cms-editing' of github.com:MITx/mitx into cdodge/meta-data-cms-editing

Conflicts:
	cms/static/coffee/src/models/module.coffee

cms/djangoapps/contentstore/views.py

@@ -286,7 +286,7 @@ def save_item(request):
         modulestore().update_children(item_location, children)
 
     # cdodge: also commit any metadata which might have been passed along in the
-    # POST from the client
+    # POST from the client, if it is there
     if request.POST['metadata']:
         modulestore().update_metadata(item_location, request.POST['metadata'])