Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

Conflicts:
	public/assets/wechat/edit_class_group.html
	public/assets/wechat/join_classgroup.html

public/assets/wechat/edit_class_group.html

@@ -2,7 +2,7 @@
     <div loading-spinner></div>
 
     <div class="blue-title">分班管理</div>
-    <div class="class-detail-row f13 c-grey3"><img src="images/logo.png" ng-src="{{course.img_url}}" class="fl ml10 img-circle mt4" width="30" height="30"><span class="fl mt10 ml10 ng-binding">{{course.syllabus_title}}<font ng-if="course.syllabus_title != null" class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{course.name}}</span><div class="cl"></div> </div>
+    <div class="class-detail-row f13 c-grey3"><img ng-src="{{course.img_url}}" class="fl ml10 img-circle mt4" width="30" height="30"><span class="fl mt10 ml10 ng-binding">{{course.syllabus_title}}<font ng-if="course.syllabus_title != null" class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{course.name}}</span><div class="cl"></div> </div>
     <form novalidate name="groupForm">
         <div class="course-list-row f13 c-grey3 mt10" ng-repeat="group in groups" ><span class="fl ml15 c-grey3">分班名称</span><input ng-change="group.change = true" required ng-class="['new-class-input ml25', {'c-grey':group.change} ]" ng-model="group.tmpname" placeholder="如：16级1班" /><a ng-click="deleteGroup($index)" class="fr mr10 c-grey6 delete-class-link">删除</a></div>
         <div class="tac"><a ng-click="addGroup()" class="link-blue2 f13 mt15 inline-block add-class-link">+新增分班</a></div>

public/assets/wechat/join_classgroup.html

@@ -2,7 +2,7 @@
     <div loading-spinner></div>
     <div ng-show="current_course" class="post-container" style="padding-bottom:50px;">
         <div class="blue-title">欢迎加入班级</div>
-        <div class="class-detail-row f13 c-grey3"><img src="images/logo.png" ng-src="{{current_course.img_url}}" class="fl ml10 img-circle mt4" width="30" height="30"><span class="fl mt10 ml10 ng-binding">{{course.syllabus_title}}<font ng-if="course.syllabus_title != null" class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span><div class="cl"></div> </div>
+        <div class="class-detail-row f13 c-grey3"><img ng-src="{{current_course.img_url}}" class="fl ml10 img-circle mt4" width="30" height="30"><span class="fl mt10 ml10 ng-binding">{{course.syllabus_title}}<font ng-if="course.syllabus_title != null" class="fb" style="height:18px; line-height:18px; vertical-align:top; margin:0 3px;">·</font>{{current_course.name}}</span><div class="cl"></div> </div>
         <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15">选择分班</span></div>
         <ul class="class-list f13 c-grey3">
             <li><span class="fl ml10 class-list-name hidden">暂无</span><span ng-click="selectGroup(0)" class="login-box fr mr10 mt12 img-circle" ng-class="[{'checked': selectid == 0}]"></span></li>