diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index f9b5b7d32..2c7df84cf 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -160,6 +160,7 @@ class MessagesController < ApplicationController
     @reply.safe_attributes = params[:reply]
     @reply.content = @quote + @reply.content
     @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject]
+    # @reply.reply_id = params[:id]
     @topic.children << @reply
     user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
     user_activity.updated_at = Time.now
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 414ef6d70..251c47d4c 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -189,6 +189,7 @@ class ProjectsController < ApplicationController
     @project.organization_id = params[:organization_id]
     @project.user_id = User.current.id
     @project.project_new_type = params[:project_new_type]
+    params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0
     if validate_parent_id && @project.save
       @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
       # Add current user as a project member if he is not admin
diff --git a/app/models/message.rb b/app/models/message.rb
index 37129885f..2c46857f8 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -86,7 +86,7 @@ class Message < ActiveRecord::Base
   }
 
 
-  safe_attributes 'subject', 'content'
+  safe_attributes 'subject', 'content', 'reply_id'
   safe_attributes  'board_id','locked', 'sticky',
     :if => lambda {|message, user|
       if message.project
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 2b706be7f..67867e2c6 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -45,134 +45,13 @@
     <div class="cl"></div>
 
     <!--属性-->
-<<<<<<< .mine
     <%= render :partial => 'attributes_show' %>
     <!--pro_info_box 属性 end-->
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
-      <div class="pro_info_box mb10">
-        <%= issue_fields_rows do |rows| %>
-            <ul class="fl">
-              <li><p class="label03">&nbsp;状态&nbsp;&nbsp;:&nbsp;</p>
-
-                <p class="pro_info_p"><%= @issue.status.name %></p>
-              </li>
-              <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('assigned_to_id') %>
-                  <li><p class="label03">&nbsp;指派给&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p"><%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %></span>
-                  </li>
-              <% end %>
-              <div class="cl"></div>
-            </ul>
-            <ul class="fl">
-              <li><p class="label03">&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p>
-                <span class="pro_info_p" style="width:50px;"><%= @issue.priority.name %></span>
-              </li>
-              <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('done_ratio') %>
-                  <li><p class="label03">&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p" style="width:50px;"><%= @issue.done_ratio %>%</span>
-                  </li>
-              <% end %>
-              <div class="cl"></div>
-            </ul>
->>>>>>> .theirs
-
-<<<<<<< .mine
     <%# 该应用是对issue主题内容的引用，对应:to => 'journals#new %>
     <!--<div class="cl"></div>-->
     <!--<%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'talk_edit fr' if authorize_for('issues', 'edit') %>-->
-
-
-
-
     <div class="cl"></div>
-=======
-            <ul class="fl ">
-              <% unless @issue.disabled_core_fields.include?('start_date') %>
-                  <li><p class="label03" style="width:50px;">&nbsp;开始&nbsp;&nbsp;:&nbsp;</p>
-
-                    <p class="pro_info_p"><%= format_date(@issue.start_date) %></p>
-                  </li>
-              <% end %>
-              <div class="cl"></div>
->>>>>>> .theirs
-<<<<<<< .mine
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
-              <% unless @issue.disabled_core_fields.include?('estimated_hours') %>
-                  <li><p class="label03" style="width:50px;">&nbsp;周期&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
-                  </li>
-              <% end %>
-              <div class="cl"></div>
-            </ul>
-            <ul class="fl ">
-              <% unless @issue.disabled_core_fields.include?('due_date') %>
-                  <li><p class="label03">&nbsp;计划完成&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p" style="width:120px;"><%= format_date(@issue.due_date) ? format_date(@issue.due_date) : "--" %></span>
-                  </li>
-              <% end %>
-              <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('fixed_version_id') %>
-                  <li><p class="label03">&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p" style="width:120px;"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %></span>
-                  </li>
-              <% end %>
-              <div class="cl"></div>
-            </ul>
-            <% end %><!--pro_info_box end-->
-        <%#= render_custom_fields_rows(@issue) %>
-        <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
->>>>>>> .theirs
   </div>
 
   <!--problem_main end-->
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index c7895efb7..d536b6ed7 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -224,65 +224,89 @@
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>
-                <!--作品开启匿评 待整合：时间紧-->
-                <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-                      <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
-                      <% if ma.viewed == 0 %>
-                          <li class="homepageHomeworkContent fl">
-                            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
-                                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover =>"message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))" %>
-                          </li>
-                          <div  style="display: none" class="message_title_red system_message_style">
-                            <%= ma.course_message.name %>
-                          </div>
-                          <li  class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 开启匿评了！</li>
-                      <% else %>
-                          <li class="homepageNewsContent fl">
-                            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover =>"message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))"%>
-                          </li>
-                          <div  style="display: none" class="message_title_red system_message_style">
-                            <%= ma.course_message.name %>
-                          </div>
-                      <% end %>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
+                  <!--作品开启匿评 待整合：时间紧-->
+                  <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
+                      <ul class="homepageNewsList fl">
+                        <li class="homepageNewsPortrait fl">
+                          <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+                        </li>
+                        <li class="homepageNewsPubType fl">
+                          <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                                      user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                          <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动了作业匿评：</span>
+                        </li>
+                        <li class="homepageNewsContent fl">
+                          <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                                      :onmouseover => "message_titile_show($(this),event)",
+                                      :onmouseout => "message_titile_hide($(this))" %>
+                        </li>
+                        <div style="display: none" class="message_title_red system_message_style">
+                          <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师开启了匿评，作业详情如下：</p>
+                          <p><strong>课程：</strong><%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+                          <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
+                          <% unless ma.course_message.description.blank? %>
+                              <div class="fl"><strong>作业内容：</strong></div>
+                              <div class="ml60"><%= ma.course_message.description.html_safe %></div>
+                          <% end %>
+                          <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %>
+                          </p>
+                        </div>
+                        <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+                      </ul>
+                  <% end %>
                 <!--作品关闭匿评-->
                 <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %>
                     <ul class="homepageNewsList fl">
                       <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-                      <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
-                      <% if ma.viewed == 0 %>
-                          <li class="homepageHomeworkContent fl">
-                            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
-                                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                                        :onmouseover =>"message_titile_show($(this),event)",
-                                        :onmouseout => "message_titile_hide($(this))" %>
-                          </li>
-                          <div  style="display: none" class="message_title_red system_message_style">
-                            <%= ma.course_message.name %>
-                          </div>
-                          <li  class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 匿评已经关闭！</li>
-                      <% else %>
+                      <li class="homepageNewsPubType fl">
+                        <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                                   user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">关闭了作业匿评：</span></li>
                           <li class="homepageNewsContent fl">
-                            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                                         :onmouseover =>"message_titile_show($(this),event)",
                                         :onmouseout => "message_titile_hide($(this))"%>
                           </li>
                           <div  style="display: none" class="message_title_red system_message_style">
-                            <%= ma.course_message.name %>
+                            <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师关闭了匿评，作业详情如下：</p>
+                            <p><strong>课程：</strong><%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+                            <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
+                            <% unless ma.course_message.description.blank? %>
+                                <div class="fl"><strong>作业内容：</strong></div>
+                                <div class="ml60"><%= ma.course_message.description.html_safe %></div>
+                            <% end %>
                           </div>
-                      <% end %>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>
 
+                <% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 %>
+                      <ul class="homepageNewsList fl">
+                        <li class="homepageNewsPortrait fl">
+                          <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+                        </li>
+                        <li class="homepageNewsPubType fl">
+                          <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                                      user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
+                          <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动作业匿评失败</span>
+                        </li>
+                        <li class="homepageNewsContent fl">
+                          <%= link_to "作业题目：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                                      :onmouseover => "message_titile_show($(this),event)",
+                                      :onmouseout => "message_titile_hide($(this))" %>
+                        </li>
+                        <div style="display: none" class="message_title_red system_message_style">
+                          <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师启动作业匿评失败，作业详情如下：</p>
+                          <p><strong>课程：</strong><%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+                          <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
+                          <% unless ma.course_message.description.blank? %>
+                              <div class="fl"><strong>作业内容：</strong></div>
+                              <div class="ml60"><%= ma.course_message.description.html_safe %></div>
+                          <% end %>
+                        </div>
+                        <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+                      </ul>
+                <% end %>
+
                 <% if ma.course_message_type == "Poll" %>
                     <ul class="homepageNewsList fl">
                       <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
diff --git a/db/migrate/20150924063215_add_reply_id_to_message.rb b/db/migrate/20150924063215_add_reply_id_to_message.rb
new file mode 100644
index 000000000..b55449ad7
--- /dev/null
+++ b/db/migrate/20150924063215_add_reply_id_to_message.rb
@@ -0,0 +1,5 @@
+class AddReplyIdToMessage < ActiveRecord::Migration
+  def change
+    add_column :messages, :reply_id, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 40daded12..b364ed83e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150918134804) do
+ActiveRecord::Schema.define(:version => 20150924063215) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -476,6 +476,13 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -895,6 +902,7 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
     t.datetime "updated_on",                       :null => false
     t.boolean  "locked",        :default => false
     t.integer  "sticky",        :default => 0
+    t.integer  "reply_id"
   end
 
   add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
@@ -912,7 +920,6 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
-    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"
@@ -1324,7 +1331,7 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
     t.datetime "updated_at",                                                       :null => false
     t.integer  "late_penalty",                                  :default => 0
     t.integer  "absence_penalty",                               :default => 0
-    t.float    "system_score",                                  :default => 0.0
+    t.integer  "system_score"
     t.boolean  "is_test",                                       :default => false
   end
 
diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake
index af833448d..75166391d 100644
--- a/lib/tasks/homework_evaluation.rake
+++ b/lib/tasks/homework_evaluation.rake
@@ -25,9 +25,25 @@ namespace :homework_evaluation do
             end
           end
           homework_detail_manual.update_column('comment_status', 2)
-          # 匿评开启消息邮件通知
+          # 匿评开启消息邮件通知，# 所有人
+          course = homework_common.course
+          course.members.each do |m|
+            homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
+          end
+          # 邮件通知
+          Mailer.send_mail_anonymous_comment_close(homework_common).deliver
         else
-          #作业数小于2，启动失败
+          #作业数小于2，启动失败, 只给老师发
+          # status==4 发送失败
+          # 匿评开启消息邮件通知，# 所有人
+          course = homework_common.course
+          course.members.each do |m|
+            if m.user.allowed_to?(:as_teacher,course)
+              homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 4)
+            end
+          end
+          # 邮件通知
+          # Mailer.send_mail_anonymous_comment_close(homework_common).deliver
         end
       end
     end
@@ -47,7 +63,13 @@ namespace :homework_evaluation do
           student_work.save
         end
         homework_detail_manual.update_column('comment_status', 3)
-        # 匿评关闭消息邮件通知
+        # 匿评关闭消息通知 给所有人发
+        course = homework_common.course
+        course.members.each do |m|
+          homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 3)
+        end
+        # 邮件通知
+        Mailer.send_mail_anonymous_comment_close(homework_common).deliver
       end
     end
   end