diff --git a/app/controllers/avatar_controller.rb b/app/controllers/avatar_controller.rb
index 73c1dbd90..fa7eb6052 100644
--- a/app/controllers/avatar_controller.rb
+++ b/app/controllers/avatar_controller.rb
@@ -2,7 +2,7 @@ class AvatarController < ApplicationController
   
      
   #before_filter :set_cache_buster   
-  include AvatarHelper   
+  include AvatarHelper
       
   def upload
     # Make sure that API users get used to set this content type
@@ -77,6 +77,40 @@ class AvatarController < ApplicationController
       }
     end
   end
+
+  #add by zjc
+  #删除图片
+  def delete_image
+    @source_type = params[:source_type]
+    @source_id = params[:source_id]
+    @source = nil #eval(@source_type).find(@source_id)
+    c = Object.const_get(@source_type)
+    if c.respond_to?(:find)
+      @source = c.find(@source_id)
+    end
+
+    diskfile=disk_filename(@source_type,@source_id)
+    unless diskfile.nil? || diskfile == ""
+      path = File.dirname(diskfile)
+      if File.directory?(path) && File.exist?(diskfile)
+        File.delete(diskfile)
+      end
+    end
+  rescue e do
+    logger.info e.message
+    end
+      respond_to do |format|
+        format.js
+        format.api {
+          if saved
+            render :action => 'upload', :status => :created
+          else
+            render_validation_errors(@avatar)
+          end
+        }
+      end
+
+  end
   
   private
   
diff --git a/app/helpers/avatar_helper.rb b/app/helpers/avatar_helper.rb
index 2ebdae0c8..3f6802f59 100644
--- a/app/helpers/avatar_helper.rb
+++ b/app/helpers/avatar_helper.rb
@@ -38,7 +38,7 @@ module AvatarHelper
       avatar_image(source)
     else
       File.join(relative_path,avatar_directory(source.class),'0')
-    end    
+    end
   end
   
   def get_avatar?(source)
diff --git a/app/views/admin/contest_page_made.html.erb b/app/views/admin/contest_page_made.html.erb
index b8a86fa4d..a4407cd6b 100644
--- a/app/views/admin/contest_page_made.html.erb
+++ b/app/views/admin/contest_page_made.html.erb
@@ -17,7 +17,7 @@
     <p style="margin-left:60px;padding-right: 20px;">
       <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
     </p>
-    <div style="margin-left: 82px;">
+    <div style="margin-left: 82px;" id="avatar">
       <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@contest_page} %>
     </div>
     <p style="margin-left:60px;padding-right: 20px;">
diff --git a/app/views/admin/course_page_made.html.erb b/app/views/admin/course_page_made.html.erb
index 4554fb8e0..7d73c7c6e 100644
--- a/app/views/admin/course_page_made.html.erb
+++ b/app/views/admin/course_page_made.html.erb
@@ -16,7 +16,7 @@
     <p style="margin-left:60px;padding-right: 20px;">
       <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
     </p>
-    <div style="margin-left: 82px;">
+    <div style="margin-left: 82px;" id="avatar">
       <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@course_page} %>
     </div>
     <p style="margin-left:60px;padding-right: 20px;">
diff --git a/app/views/admin/first_page_made.html.erb b/app/views/admin/first_page_made.html.erb
index a64bbb443..d3b7416e4 100644
--- a/app/views/admin/first_page_made.html.erb
+++ b/app/views/admin/first_page_made.html.erb
@@ -16,7 +16,7 @@
     <p style="margin-left:60px;padding-right: 20px;">
       <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
      </p>
-    <div style="margin-left: 82px;">
+    <div style="margin-left: 82px;" id="avatar">
         <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@first_page} %>
     </div>
 
diff --git a/app/views/avatar/_avatar_form.html.erb b/app/views/avatar/_avatar_form.html.erb
index a880f32aa..6f9b9c7b1 100644
--- a/app/views/avatar/_avatar_form.html.erb
+++ b/app/views/avatar/_avatar_form.html.erb
@@ -1,3 +1,4 @@
+<div id="avatardiv">
 <style type="text/css">
 	a, a:hover {text-decoration:none;}
 	.btn_addPic
@@ -42,7 +43,8 @@
     	<div id="upload_progressbar" style="height:14px; margin-bottom: 10px;display: block"></div>
     </div>
 </span>
-<a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
+<%= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "btn_addPic", :style => "text-decoration:none;" %>
+  <a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
 	<span><%= l(:button_upload_photo) %></span>
 </a>
   <!--         :accept => 'image/png,image/gif,image/jpeg', -->
@@ -70,3 +72,4 @@
 <% content_for :header_tags do %>
   <%= javascript_include_tag 'avatars' %>
 <% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/avatar/delete_image.js.erb b/app/views/avatar/delete_image.js.erb
new file mode 100644
index 000000000..908af2513
--- /dev/null
+++ b/app/views/avatar/delete_image.js.erb
@@ -0,0 +1,5 @@
+var avatardiv = $('#avatardiv');
+avatardiv.replaceWith("<%= escape_javascript(render :partial=>'avatar/avatar_form',:style => 'display:inline',:locals=> {source:@source}) %>");
+//var imgSpan = $('#avatar_image');
+
+//imgSpan.attr({"src":'<#%= @urlfile.to_s << "?" << Time.now.to_s%>'});
\ No newline at end of file
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 3853af34d..8d67f5807 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -36,20 +36,21 @@
 <%= error_messages_for 'user' %>
 
 <fieldset class="box" style="margin:10px;">
-<fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">
-  <legend onclick="toggleFieldset(this);">
-    <%= l(:label_my_photo) %>
-  </legend>
-  <div>
-    <!--upload profiles-->
-    <%= render :partial => "avatar/avatar_form", :locals => {source: @user} %>
-    <!--upload-->
-  </div>
-</fieldset>
+
 <%= labelled_form_for :user, @user,
                       :url => {:action => "account"},
                       :html => {:id => 'my_account_form',
                                 :method => :post} do |f| %>
+    <fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">
+      <legend onclick="toggleFieldset(this);">
+        <%= l(:label_my_photo) %>
+      </legend>
+      <div>
+        <!--upload profiles-->
+        <%= render :partial => "avatar/avatar_form",:style => "display:inline", :locals => {source: @user} %>
+        <!--upload-->
+      </div>
+    </fieldset>
     <fieldset class="collapsible collapsed" style="width:800px;margin-left: 10px;">
     <legend onclick="toggleFieldset(this);">
       <%= l(:label_information_plural) %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f24ef0ae5..64f4efc1f 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1484,6 +1484,7 @@ zh:
   label_contest_description: 内容：对你的竞赛进行描述
   label_requirement_bargain_money: 输入具体奖励方式（如金钱、奖项、学分）
   button_upload_photo: 上传图片
+  button_delete_file: 删除
   label_leave_me_message: 给我留言了
   label_leave_others_message: 给他留言了
   label_leave_a_message: 给他（她）留言
diff --git a/config/routes.rb b/config/routes.rb
index dfb8d503b..ea6211570 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -629,6 +629,7 @@ RedmineApp::Application.routes.draw do
   match 'uploads', :to => 'attachments#upload', :via => :post
   # Added by Tao
   match 'upload_avatar', :to => 'avatar#upload', :via => :post
+  match 'delete_avatar', :to => 'avatar#delete_image',:via => :post
   # Endof Tao's code
   get 'robots.txt', :to => 'welcome#robots'
 
diff --git a/db/migrate/20140714081030_set_web_title.rb b/db/migrate/20140714081030_set_web_title.rb
index 48921ed4e..51b1f6d89 100644
--- a/db/migrate/20140714081030_set_web_title.rb
+++ b/db/migrate/20140714081030_set_web_title.rb
@@ -1,3 +1,4 @@
+# -*coding:utf-8 -*-
 class SetWebTitle < ActiveRecord::Migration
   def change
     FirstPage.all.each do |fp|
diff --git a/db/schema.rb b/db/schema.rb
index 0e170a64f..f318ff96a 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 => 20140711012924) do
+ActiveRecord::Schema.define(:version => 20140714081030) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -177,6 +177,58 @@ ActiveRecord::Schema.define(:version => 20140711012924) do
 
   add_index "changesets_issues", ["changeset_id", "issue_id"], :name => "changesets_issues_ids", :unique => true
 
+  create_table "code_review_assignments", :force => true do |t|
+    t.integer "issue_id"
+    t.integer "change_id"
+    t.integer "attachment_id"
+    t.string  "file_path"
+    t.string  "rev"
+    t.string  "rev_to"
+    t.string  "action_type"
+    t.integer "changeset_id"
+  end
+
+  create_table "code_review_project_settings", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "tracker_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "updated_by"
+    t.boolean  "hide_code_review_tab",     :default => false
+    t.integer  "auto_relation",            :default => 1
+    t.integer  "assignment_tracker_id"
+    t.text     "auto_assign"
+    t.integer  "lock_version",             :default => 0,     :null => false
+    t.boolean  "tracker_in_review_dialog", :default => false
+  end
+
+  create_table "code_review_user_settings", :force => true do |t|
+    t.integer  "user_id",           :default => 0, :null => false
+    t.integer  "mail_notification", :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "code_reviews", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "change_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "line"
+    t.integer  "updated_by_id"
+    t.integer  "lock_version",        :default => 0, :null => false
+    t.integer  "status_changed_from"
+    t.integer  "status_changed_to"
+    t.integer  "issue_id"
+    t.string   "action_type"
+    t.string   "file_path"
+    t.string   "rev"
+    t.string   "rev_to"
+    t.integer  "attachment_id"
+    t.integer  "file_count",          :default => 0, :null => false
+    t.boolean  "diff_all"
+  end
+
   create_table "comments", :force => true do |t|
     t.string   "commented_type", :limit => 30, :default => "", :null => false
     t.integer  "commented_id",                 :default => 0,  :null => false
@@ -359,9 +411,9 @@ ActiveRecord::Schema.define(:version => 20140711012924) do
     t.string   "web_title"
     t.string   "title"
     t.string   "description"
-    t.string   "page_type"
     t.datetime "created_at",  :null => false
     t.datetime "updated_at",  :null => false
+    t.string   "page_type"
   end
 
   create_table "forums", :force => true do |t|
@@ -754,18 +806,18 @@ ActiveRecord::Schema.define(:version => 20140711012924) 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",            :limit => 16777215,                    :null => false
+    t.string   "subject",                               :null => false
+    t.text     "content",                               :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"
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 9bba6cbbd..445a9053c 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -571,7 +571,7 @@ function warnLeavingUnsaved(message) {
 function setupAjaxIndicator() {
 
   $('#ajax-indicator').bind('ajaxSend', function(event, xhr, settings) {
-  
+
     if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') {
       $('#ajax-indicator').show();
     }
diff --git a/public/javascripts/avatars.js b/public/javascripts/avatars.js
index db9a2255e..747eb11e1 100644
--- a/public/javascripts/avatars.js
+++ b/public/javascripts/avatars.js
@@ -51,6 +51,7 @@ function ajaxUpload(file, fileSpan, inputEl) {
         ajaxUpload.uploading--;
         fileSpan.removeClass('ajax-loading');
         var form = fileSpan.parents('form');
+
         if (form.queue('upload').length == 0 && ajaxUpload.uploading == 0) {
           $('input:submit', form).removeAttr('disabled');
         }