Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/courses/_join_private_course.html.erb

@@ -71,7 +71,7 @@
               <span class="tips">密&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;码：</span>
               <input class=" width190" type="password" name="course_password" id="course_password" value="" >
             </li>
-            <li style="margin-top: 30px;">
+            <li style="margin-top: 30px;display: none">
               <span style="margin-right: 20px;">身&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;份：</span>
               <select class="IDType">
                 <option>教师</option>