diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index 55f515a11..3cf6a7c40 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -7,7 +7,7 @@
     <div class="box tabular">
      <%= render :partial => 'course_form', :locals => { :f => f } %>
       <span style="padding-left: 60px"><%= submit_tag l(:button_create), :class => "enterprise"%></span>
-      <!-- <%= submit_tag l(:button_create_and_continue), :name => 'course_continue' %> -->
+      <!-- <%#= submit_tag l(:button_create_and_continue), :name => 'course_continue' %> -->
     <%= javascript_tag "$('#course_name').focus();" %>
     </div>
 <% end %>
diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb
index 5f507db3c..bcb10c78b 100644
--- a/app/views/projects/_project.html.erb
+++ b/app/views/projects/_project.html.erb
@@ -95,9 +95,21 @@
 		<%= content_tag('span', "#{l(:default_role_manager)}: ") %>
 		<% end %>
 		<% @admin = @project.project_infos%>
-		<% if @admin.size > 0 %>
-		<%= content_tag('a', @admin.collect{|u| link_to(u.user.name, user_path(u.user_id))}.join(", ").html_safe)  %>
-		<% end %>
+
+          <% if @admin.size > Setting.show_tags_length.to_i then %>
+              <% i = 0 %>
+              <% until i>Setting.show_tags_length.to_i do %>
+                 <%= link_to @admin[i].user.name, user_path(@admin[i].user_id) %>
+                 <% i += 1 %>
+              <% end %>
+              <%= link_to l(:label_more_tags), member_project_path(@project) %>
+          <% else %>
+            <%= content_tag('a', @admin.collect{|u| link_to(u.user.name, user_path(u.user_id))}.join(", ").html_safe)  %>
+          <% end %>
+
+		<%# if @admin.size > 0 %>
+		<%#= content_tag('a', @admin.collect{|u| link_to(u.user.name, user_path(u.user_id))}.join(", ").html_safe)  %>
+		<%# end %>
 		<% if(@project.project_type==1)%>
 		&nbsp;&nbsp;&nbsp;<%= l(:label_course_college) %>：
 		<%if @admin&&@admin.first&&@admin.first.user&&@admin.first.user.user_extensions%>
diff --git a/db/schema.rb b/db/schema.rb
index 690ec2681..01b42f8a3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -809,18 +809,18 @@ ActiveRecord::Schema.define(:version => 20140719080032) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                               :null => false
-    t.text     "content",                               :null => false
+    t.string   "subject",                                                   :null => false
+    t.text     "content",            :limit => 16777215,                    :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",      :default => 0
+    t.integer  "replies_count",                          :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",               :default => false
-    t.boolean  "sticky",             :default => false
-    t.boolean  "is_quote",           :default => false
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
-    t.integer  "viewed_count_crawl", :default => 0
-    t.integer  "viewed_count_local", :default => 0
+    t.boolean  "lock",                                   :default => false
+    t.boolean  "sticky",                                 :default => false
+    t.boolean  "is_quote",                               :default => false
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.integer  "viewed_count_crawl",                     :default => 0
+    t.integer  "viewed_count_local",                     :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
@@ -844,6 +844,19 @@ ActiveRecord::Schema.define(:version => 20140719080032) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1