Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4

Conflicts:
	jenkins/test.sh

common/lib/xmodule/xmodule/js/src/html/edit.coffee

@@ -12,6 +12,9 @@ class @HTMLEditingDescriptor
 
     $(@advanced_editor.getWrapperElement()).addClass(HTMLEditingDescriptor.isInactiveClass)
 
+#   This is a workaround for the fact that tinyMCE's baseURL property is not getting correctly set on AWS
+#   instances (like sandbox). It is not necessary to explicitly set baseURL when running locally.
+    tinyMCE.baseURL = '/static/js/vendor/tiny_mce'
     @tiny_mce_textarea = $(".tiny-mce", @element).tinymce({
       script_url : '/static/js/vendor/tiny_mce/tiny_mce.js',
       theme : "advanced",

common/lib/xmodule/xmodule/templates/discussion/default.yaml

@@ -1,6 +1,9 @@
 ---
 metadata:
     display_name: Discussion Tag
+    for: Topic-Level Student-Visible Label 
+    id: 6002x_group_discussion_by_this 
+    discussion_category: Week 1
 data: |
   <discussion for="Topic-Level Student-Visible Label" id="6002x_group_discussion_by_this" discussion_category="Week 1" />
 children: []