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

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

cms/static/coffee/src/views/unit.coffee

@@ -12,7 +12,7 @@ class CMS.Views.UnitEdit extends Backbone.View
 
   initialize: =>
     @visibilityView = new CMS.Views.UnitEdit.Visibility(
-      el: @$('#visibility')
+      el: @$('.visibility-select')
       model: @model
     )
 
@@ -150,7 +150,7 @@ class CMS.Views.UnitEdit extends Backbone.View
     )
 
   setVisibility: (event) ->
-    if @$('#visibility').val() == 'private'
+    if @$('.visibility-select').val() == 'private'
       target_url = '/unpublish_unit'
     else
       target_url = '/publish_draft'

cms/templates/import.html

@@ -14,7 +14,7 @@
         <h2>Please <a href="https://edge.edx.org/courses/edX/edx101/edX_Studio_Reference/about" target="_blank">read the documentation</a> before attempting an import!</h2>
         <p><strong>Importing a new course will delete all content currently associated with your course
         and replace it with the contents of the uploaded file.</strong></p>
-        <p>File uploads must be zip files containing, at a minimum, a <code>course.xml</code> file.</p>
+        <p>File uploads must be gzipped tar files (.tar.gz or .tgz) containing, at a minimum, a <code>course.xml</code> file.</p>
         <p>Please note that if your course has any problems with auto-generated <code>url_name</code> nodes,
         re-importing your course could cause the loss of student data associated with those problems.</p>
       </div>