diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f2de6085f..2d1f8d771 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -112,7 +112,6 @@ class ProjectsController < ApplicationController
       @project_pages = Project.project_entities.visible.like(params[:name]).page(params[:page]).per(10)
     else
       @project_pages =  Project.project_entities.visible.page(params[:page] ).per(10)
-      @project_pages =  Project.project_entities.visible.page(params[:page] ).per(10)
     end
     @projects =   @project_pages.order("created_on desc")
     @limit = 10#per_page_option
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9eabc95f2..625a1de74 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2283,7 +2283,7 @@ class UsersController < ApplicationController
         @orgs = @user.organizations.where("name like ?", search).select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Resource'").count > 0}
       end
     else
-      if params[:send_type].present? and params[:send_type] == 'news'
+      if params[:send_type].present? and (params[:send_type] == 'news' or params[:send_type] == 'message')
         @orgs = @user.organizations.select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Post'").count > 0}
       else
         @orgs = @user.organizations.select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Resource'").count > 0}
diff --git a/app/helpers/avatar_helper.rb b/app/helpers/avatar_helper.rb
index 0291d177f..5c3ffd950 100644
--- a/app/helpers/avatar_helper.rb
+++ b/app/helpers/avatar_helper.rb
@@ -63,7 +63,7 @@ module AvatarHelper
     if source.class && source.id && File.exist?(disk_filename(source.class,source.id))
       avatar_image(source, false)
     elsif copy_course?(source.class, source.id)
-      avatar_image(source, true)
+      get_avatar(Course.find(source.is_copy)) rescue nil
     else
       File.join(relative_path,avatar_directory(source.class),'0')
     end
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 9d3f76cc6..9f026d69d 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -43,16 +43,11 @@
         <%#= link_to '首页', organization_path(@organization, :show_homepage => 1),:class=>"linkGrey8 f14" %>
       </li>
       <% if User.current.logged? %>
-          <li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;">
-          <span class="orgMenuArrow" id="orgArrow">
-            <ul class="org_login_list" style="display:none;">
-              <li> <%= link_to "个人主页",user_path(User.current), :class => "menuGrey", :target => "_blank" %></li>
-              <li><%= link_to "退出",logout_organization_path(@organization), :class =>"menuGrey", :method => 'post', :rel => "nofollow" %></li>
-              <!--<li><%#= link_to "退出",signout_path, :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>-->
-            </ul>
-          </span>
+          <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;">
+            <%= link_to image_tag(url_to_avatar(User.current),:width => '23',:height => '23'), user_path(User.current),:alt => '用户头像', :target => '_blank',:style=>'border-radius:3px; vertical-align:top; margin-top:3px; display:inline-block; margin-right:3px;' %>
+            <%= link_to User.current, user_path(User.current),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %>
+            <%= link_to "退出",logout_organization_path(@organization), :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
           </li>
-          <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><a href="javascript:void(0);" class="fontGrey2 f14" id="orgUserName"><%= User.current %></a></li>
           <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
           <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>true) %>" class="linkGrey8 f14">登录</a></li>
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 43535153d..6f01bf65c 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -60,6 +60,31 @@
 <% end %>
 
 
+<<<<<<< HEAD
+<%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post"} do |f| %>
+<div id="pro_st_edit_ku" class="pro_st_edit_ku">
+  <ul>
+    <li >
+      <label class="label02"><%=l(:label_scm)%>：</label>
+      <%= label_tag('repository_scm',
+                     options_for_select(["Git"],@repository.class.name.demodulize),
+                     :data => {:remote => true, :method => 'get'})%>
+      <% if @repository && ! @repository.class.scm_available %>
+          <span class="c_grey"><%= l(:text_scm_command_not_available) %></span>
+      <% end %>
+    </li>
+    <% unless judge_main_repository(@project) %>
+        <li>
+            <label class="label02"><%=l(:field_repository_is_default)%>：</label>
+            <%= f.check_box :is_default, :label => "", :no_label => true %></p>
+        </li>
+    <% end %>
+    <li >
+      <label class="label02"><span class="c_red">*</span><%=l(:label_repository_name)%>：</label>
+      <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>"", :no_label => true %>
+      <% unless @repository.identifier_frozen? %>
+         <span class="c_grey"><%=l(:text_length_between,:min=>1,:max=>254)<<l(:text_project_identifier_info) %></span>
+=======
 <% if @project.repositories.any? %>
     <%= render :partial => 'projects/settings/rep_gitlab', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %>
     <%#= render :partial => 'projects/settings/rep_forge', :locals => {:project => @project, :ip => "ip", :project_path_cut => "project_path_cut" } %>
@@ -84,6 +109,7 @@
                 <td class="w360" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
             <% end %>
           </tr>
+>>>>>>> develop
       <% end %>
       </tbody>
     </table>
diff --git a/app/views/users/search_user_course.js.erb b/app/views/users/search_user_course.js.erb
index 11db47950..f4509987f 100644
--- a/app/views/users/search_user_course.js.erb
+++ b/app/views/users/search_user_course.js.erb
@@ -10,11 +10,11 @@
 //$("#upload_box").html('<%#= escape_javascript( render :partial => "resource_share_popup" ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 //$("#upload_box").css('display','block');
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% elsif params[:send_type] == 'file' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% elsif params[:send_type] == 'message' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% end %>
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
diff --git a/app/views/users/search_user_org.js.erb b/app/views/users/search_user_org.js.erb
index 0d4b71a60..ee12e9439 100644
--- a/app/views/users/search_user_org.js.erb
+++ b/app/views/users/search_user_org.js.erb
@@ -1,9 +1,9 @@
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% elsif params[:send_type] == 'file' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_orgs' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_orgs' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% elsif params[:send_type] == 'message' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% end %>
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb
index 79615d301..d58c56ca9 100644
--- a/app/views/users/search_user_project.js.erb
+++ b/app/views/users/search_user_project.js.erb
@@ -1,9 +1,9 @@
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% elsif params[:send_type] == 'file' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% elsif params[:send_type] == 'message' %>
-    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% end %>
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
diff --git a/public/javascripts/create_kindeditor.js b/public/javascripts/create_kindeditor.js
index bc28aa2bd..fc2ac8938 100644
--- a/public/javascripts/create_kindeditor.js
+++ b/public/javascripts/create_kindeditor.js
@@ -19,7 +19,7 @@ function sd_create_editor(params){
             var edit = this.edit;
             var body = edit.doc.body;
             edit.iframe.height(paramsHeight);
-            //this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight))  , paramsHeight));
+            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight))  , paramsHeight));
         },
         afterBlur:function(){
             //params.toolbar_container.hide();
diff --git a/public/javascripts/des_kindEditor.js b/public/javascripts/des_kindEditor.js
index 1b952672a..206448044 100644
--- a/public/javascripts/des_kindEditor.js
+++ b/public/javascripts/des_kindEditor.js
@@ -126,7 +126,8 @@ function init_des_data(){
                     nh_reset_form(params);
                 });
                 params.submit_btn.click(function () {
-                    params.form.submit();
+                    params.editor.sync();
+                    params.form[0].submit();
                 });
                 params.textarea.data('init', 1);
                 $(this).show();
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 42a557010..4d09449b4 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -69,7 +69,7 @@ a.linkGrey8:hover {color:#585858;}
 .orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
 .org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px;
                    position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;}
-#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
+#orgUserName {display:inline-block;}
 .org_login_list a {color:#269ac9;}
 
 .orgListStatus {width:55px; float:left;}