Merge branch 'develop' into dev_raining

Conflicts:
	db/migrate/20170219062646_add_positon_to_training_task.rb
	db/schema.rb

app/views/cooperation/index.html.erb

@@ -40,6 +40,9 @@
       <li>
         <a href="http://www.xtu.edu.cn/" target="_blank"><img src="images/footer_logo/p-xtu.png" width="210" height="40" alt="湘潭大学"></a>
       </li>
+      <li>
+        <a href="http://www.copu.org.cn/" target="_blank"><img src="images/footer_logo/p-zgkyrj.png" width="210" height="40" alt="中国开源软件推进联盟"></a>
+      </li>
     </ul>
     <div class="cl"></div>
   </div>

app/views/projects/settings/_new_trainig_task.html.erb

@@ -1,3 +1,14 @@
+<div class="alert alert-orange ml15 mr15 mb10"><p>提示文字</p></div>
+<div class=" sy_new_tchbox clear ">
+  <a href="#" class="fr sy_btn_green mb10">开启实训</a>
+  <div class="cl"></div>
+  <div class="clear">
+    <textarea style="width:746px; height:300px;border: 1px solid #c8c8c8; padding:5px;margin-bottom: 5px;" placeholder="请输入脚本"></textarea>
+    <a href="javascript:void(0)"  class="fr btn btn-grey">取消</a>
+    <a href="javascript:void(0)"  class="fr btn btn-blue mr5">确定</a>
+  </div>
+
+</div>
 <h3>请输入脚本</h3>
 <p><%= link_to "开启实训", training_project_execute_project_path(@project) %></p>
 <textarea id="pull_request_comment" name="pull_request_comment" class="pullreques_reply_textarea" style="padding-left: 0px;"></textarea>