diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index aacb32990..42fd40606 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -99,6 +99,7 @@ class FilesController < ApplicationController
   end
 
   def index
+    @flag = params[:flag] || false
     #sort_init 'filename', 'asc'
     sort_init 'created_on', 'desc' 
     sort_update   'created_on' => "#{Attachment.table_name}.created_on", 
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f83580fba..4f84212b4 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -334,8 +334,7 @@ class ProjectsController < ApplicationController
   end
 
   def send_mail_to_member
-
-    if !params[:mail].nil? && User.find_by_mail(params[:mail].to_s).nil?
+    if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil?
       email = params[:mail]
       Mailer.send_invite_in_project(email, @project, User.current).deliver
       @is_zhuce =false
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 30b2e7a21..a36f4b183 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1198,6 +1198,17 @@ module ApplicationHelper
       html_safe
   end
 
+  def wiki_simple_format_without_paragraph(text)
+    text.to_s.
+        gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
+        gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
+        gsub(/([^\n]\n)(?=[^\n])/, '\1<br />'). # 1 newline   -> br
+        gsub("&amp;nbsp", " ").           #gsub(/<\/?.*?>/,"").
+        gsub(/&lt;\/?.*?&gt;/, "").
+        gsub("&quot;", "'").
+        html_safe
+  end
+
   def lang_options_for_select(blank=true)
    { 'Chinese简体中文 '=> 'zh', :English => :en}
   end
diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index aace20e6c..9eff409ff 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -48,7 +48,7 @@ module FilesHelper
   def courses_check_box_tags(name,courses,current_course,attachment)
     s = ''
     courses.each do |course|
-      if !(attachment.container_type && attachment.container_id == course.id)  && is_course_teacher(User.current,course) && course_in_current_or_next_term(course)
+      if !course_contains_attachment?(course,attachment)  && is_course_teacher(User.current,course) && course_in_current_or_next_term(course)
         s << "<label>#{ check_box_tag name, course.id, false, :id => nil } #{h course.name}</label>&nbsp;[#{get_course_term course}]<br/>"
       end
     end
diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb
index e204030f1..aa597f3f2 100644
--- a/app/views/files/_project_file.html.erb
+++ b/app/views/files/_project_file.html.erb
@@ -11,7 +11,7 @@
     <%= link_to(l(:label_upload_files), 'javascript:void(0);', :class => 'icon m5p5 button_submit', :onclick => "$('#relation_file_div').slideUp();$('#upload_file_div').slideToggle('slow');") if User.current.allowed_to?(:manage_files, @project) %>
     <%= link_to(l(:label_relation_files), 'javascript:void(0);', :onclick => "$('#upload_file_div').slideUp();$('#relation_file_div').slideToggle();", :class => 'icon m5p5 button_submit') if User.current.allowed_to?(:manage_files, @project) %>
     <p></p>
-    <div id="upload_file_div" class="relation_file_div hidden">
+    <div id="upload_file_div" class="relation_file_div <%= !@flag.nil?&&@flag=="true" ? '' : 'hidden'%>">
       <%= render :partial => 'new', locals: {project: @project} %>
     </div>
     <div id="relation_file_div" class="relation_file_div hidden">
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 10ff1538b..8c42298dd 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -158,7 +158,7 @@
 										<div class="subNav">
 											<%= link_to l(:label_course_file), project_files_path(@project), :style => "color:#3CA5C6" %><span  class="subnav_num">(<%= @project.attachments.count  %>)</span>
                                             <% if User.current.member_of?(@project) %>
-                                                <%= link_to "+"+l(:label_upload_files), new_project_file_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
+                                                <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
 										    <% end %>
                                         </div>
                                       	<% end%>
@@ -166,9 +166,9 @@
 										<div class="subNav">
 											<%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
 											<span  class="subnav_num">(<%= @project.repositories.count %>)</span>
-                                            <% if User.current.member_of?(@project) %>
-											    <%= link_to "+"+l(:project_module_create_repository),  new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
-                                            <% end %>
+                                            <%# if User.current.member_of?(@project) %>
+											    <%#= link_to "+"+l(:project_module_create_repository),  new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %>
+                                            <%# end %>
 										</div>
                                       	<% end %>
 
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 70628094b..e0ba05f18 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -1,3 +1,12 @@
+<script>
+	function ismail(mail) {
+ 	var filter  = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+ 	if (filter.test(mail)) return true;
+ 	else {
+ 	alert('您的电子邮件格式不正确');
+ 	return false;}
+}
+</script>
 <div class="project_r_h">
   <h2 class="project_h2">邀请加入</h2>
 </div>
@@ -9,7 +18,7 @@
 	<div class="box_main">
 		<h3 class="box_h3">发送邮件邀请新用户</h3>
 		<p class="box_p">
-			输入好友邮箱地址，Trustie帮您免费发送！
+			输入好友邮箱地址，Trustie会自动为该邮箱注册用户！
 		</p>
 		<div id="is_registed">
 			<%= render :partial => 'regested', locals: { :isregisted => false} %>
diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb
index adeaa7cab..6af69db68 100644
--- a/app/views/wiki/diff.html.erb
+++ b/app/views/wiki/diff.html.erb
@@ -29,5 +29,5 @@
 </p>
 
 <div class="text-diff" style="word-break: break-all;word-wrap: break-word;">
-  <%= simple_format_without_paragraph @diff.to_html %>
+  <%= wiki_simple_format_without_paragraph @diff.to_html %>
 </div>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 9f5cd74d0..076304404 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -17,7 +17,7 @@ zh:
   notice_successful_create: 创建成功
   notice_successful_update: 更新成功
   notice_successful_delete: 删除成功
-  notice_registed_success: 该邮箱已被注册，请直接邀请注册用户
+  notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册!
   notice_failed_delete: 删除失败
   notice_successful_connection: 连接成功
   notice_successful_join: 加入成功