diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index 6516135a8..00080db00 100644
--- a/app/views/files/_course_list.html.erb
+++ b/app/views/files/_course_list.html.erb
@@ -31,9 +31,9 @@
                       <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
 
                       <% if delete_allowed && file.container_id == @course.id && file.container_type == "Course"  %>
-              <span id="is_public_<%= file.id %>">
-                <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open c_blue",:method => :post  %>
-              </span>
+                      <span id="is_public_<%= file.id %>">
+                        <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open c_blue",:method => :post  %>
+                      </span>
                       <% else %>
                           <!--  <#%= link_to (file.is_public? ? "公开":"私有"),"javascript:void(0)",:class=>"f_l re_open" %> -->
                       <% end %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 5452aa893..05358c32a 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -131,9 +131,9 @@
 					<%= link_to image_tag(url_to_avatar(reply.author), :class => "avatar"), user_path(reply.author) %>
 				</td>
 				<td class="comments" style="word-wrap: break-word;word-break: break-all;">
-						<div class="reply_content" >
-                          <%=h sanitize(reply.content.html_safe) %>
-                        </div>
+          <div class="reply_content" >
+            <%=h sanitize(reply.content.html_safe) %>
+          </div>
 						<p>
 							<% if reply.attachments.any?%>
 							    <% options = {:author => true, :deletable => reply.deleted_attach_able_by?(User.current) } %>
@@ -183,4 +183,4 @@
         });
     };
         $("img").removeAttr("align");
-</script>
\ No newline at end of file
+</script>
diff --git a/config/application.rb b/config/application.rb
index 9e7a2ba81..83ba21b05 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -67,6 +67,8 @@ module RedmineApp
     # Do not include all helpers
     config.action_controller.include_all_helpers = false
 
+    config.action_view.sanitized_allowed_tags = 'div', 'p', 'span', 'img', 'embed'
+
     if File.exists?(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
       instance_eval File.read(File.join(File.dirname(__FILE__), 'additional_environment.rb'))
     end
diff --git a/db/schema.rb b/db/schema.rb
index 42c743588..1a59ccc86 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -606,6 +606,13 @@ ActiveRecord::Schema.define(:version => 20150602055730) do
     t.datetime "updated_at",         :null => false
   end
 
+  create_table "invite_lists", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "issue_categories", :force => true do |t|
     t.integer "project_id",                   :default => 0,  :null => false
     t.string  "name",           :limit => 30, :default => "", :null => false