diff --git a/.gitignore b/.gitignore
index 52cf51417..a88fb8be7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,6 @@ test/*
 tmp/*
 /app/models/tag.rb
 /app/models/tag.rb
+/public/images/requirements/reference - 副本 - 副本.jpg
+
+/public/images/requirements/*.jpg
diff --git a/app/assets/javascripts/teachers.js b/app/assets/javascripts/teachers.js
new file mode 100644
index 000000000..dee720fac
--- /dev/null
+++ b/app/assets/javascripts/teachers.js
@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
diff --git a/app/assets/stylesheets/teachers.css b/app/assets/stylesheets/teachers.css
new file mode 100644
index 000000000..afad32db0
--- /dev/null
+++ b/app/assets/stylesheets/teachers.css
@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index fa4de26f9..b865328f5 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -88,10 +88,12 @@ class AccountController < ApplicationController
         # create a new token for password recovery
         token = Token.new(:user => user, :action => "recovery")
         if token.save
-          Mailer.lost_password(token).deliver
-          flash[:notice] = l(:notice_account_lost_email_sent)
-          redirect_to signin_path
-          return
+          Thread.new do
+            Mailer.lost_password(token).deliver
+          end
+            flash[:notice] = l(:notice_account_lost_email_sent)
+            redirect_to signin_path
+          return                      
         end
       end
     end
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 4d6ed2966..ebf3c3ba5 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -115,13 +115,30 @@ class AttachmentsController < ApplicationController
       format.js
     end
   end
+  
+  def delete_homework
+      @bid = @attachment.container.bid
+      # Make sure association callbacks are called
+      container = @attachment.container
+      @attachment.container.attachments.delete(@attachment)
+      if container.attachments.empty?
+        container.delete
+      end
+
+    respond_to do |format|
+      format.html { redirect_to_referer_or respond_path(@bid) }
+      format.js
+    end
+  end
 
 private
   def find_project
     @attachment = Attachment.find(params[:id])
     # Show 404 if the filename in the url is wrong
     raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
-    @project = @attachment.project
+    unless @attachment.container_type == 'Bid' || @attachment.container_type == 'HomeworkAttach'
+      @project = @attachment.project
+    end
   rescue ActiveRecord::RecordNotFound
     render_404
   end
diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index df7f681e5..2e6f4b59d 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -3,10 +3,15 @@ class BidsController < ApplicationController
   #Added by young
   menu_item :respond
   menu_item :project, :only => :show_project
+  menu_item :homework_respond, :only => :homework_respond
+  menu_item :homework_statistics, :only => :homework_statistics
   #Ended by young
-  before_filter :find_bid, :only => [:show, :show_project, :create, :destroy, :more, :back, :add, :new]
+  before_filter :find_bid, :only => [:show, :show_project, :create, :destroy, :more, :back, :add, :new, :homework_respond, :add_homework, :homework_statistics]
 
   helper :watchers
+  helper :attachments
+  include AttachmentsHelper
+  
   def index
     # Modified by nie
     # @requirement_title = "4"
@@ -92,11 +97,17 @@ class BidsController < ApplicationController
     # @journals = @bid.journals.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
     # @journals.each_with_index {|j,i| j.indice = i+1}
     respond_to do |format|
+       if @bid.reward_type == 3
       format.html {
+        render :layout => 'base_homework'
+      }
+      else
+        format.html {
         render :layout => 'base_bids'
       }
+      end 
       format.api
-
+  
     end
   end
 
@@ -111,14 +122,51 @@ class BidsController < ApplicationController
     # @project = Project.where("id in []", a)
     @user = @bid.author
     @bidding_project = @bid.biding_projects
+    if @bid.homework_type == 1
+      @homework = HomeworkAttach.new
+      @homework_list = @bid.homeworks
+    end
     respond_to do |format|
+       if @bid.reward_type == 3
       format.html {
+        render :layout => 'base_homework'
+      }
+      else
+        format.html {
         render :layout => 'base_bids'
       }
+      end 
       format.api
     end
   end
 
+
+  ##### by huang
+  def show_project_homework
+     # flash[:notice] = ""
+    @membership = User.current.memberships.all(:conditions => Project.visible_condition(User.current))
+    @option = []
+    @membership.each do |membership|
+      @option << membership.project
+    end
+    # a = [1]
+    # @project = Project.where("id in []", a)
+    @user = @bid.author
+    @bidding_project = @bid.biding_projects
+    respond_to do |format|
+       if @bid.reward_type == 3
+      format.html {
+        render :layout => 'base_homework'
+      }
+      else
+        format.html {
+        render :layout => 'base_bids'
+      }
+      end 
+      format.api
+    end    
+  end
+  
   ###添加应标项目
   def add
     project = Project.where('name = ?', params[:bid]).first
@@ -128,7 +176,11 @@ class BidsController < ApplicationController
         flash[:notice] = l(:label_bidding_succeed)
       end
     else
+      if @bid.reward_type == 3 
+      flash[:error] = l(:label_bidding_homework_fail)
+      else
       flash[:error] = l(:label_bidding_fail)
+      end
     end
     @bidding_project = @bid.biding_projects
     respond_to do |format|
@@ -279,6 +331,70 @@ class BidsController < ApplicationController
       render :action => 'new_bid'
     end
   end
+  
+  def create_homework
+    @bid = Bid.new
+    @bid.name = params[:bid][:name]
+    @bid.description = params[:bid][:description]
+    @bid.reward_type = 3
+    # @bid.budget = params[:bid][:budget]
+    @bid.deadline = params[:bid][:deadline]
+    @bid.budget = 0
+    @bid.author_id = User.current.id
+    @bid.commit = 0
+    @bid.homework_type = params[:bid][:homework_type]
+    @bid.save_attachments(params[:attachments] || (params[:bid] && params[:bid][:uploads]))
+    # @bid.
+    if @bid.save
+      HomeworkForCourse.create(:project_id => params[:course_id], :bid_id => @bid.id)
+      unless @bid.watched_by?(User.current)
+        if @bid.add_watcher(User.current)
+          flash[:notice] = l(:label_bid_succeed)
+        end
+      end
+      redirect_to respond_path(@bid)
+    else
+      @bid.safe_attributes = params[:bid]
+      render :action => 'new_bid'
+    end
+  end
+  
+  def add_homework
+    # homework = HomeworkAttach.create(:bid_id => @bid.id, :user_id => User.current.id)
+    # homework.save_attachments(params[:attachments] || (params[:bid] && params[:bid][:uploads]))
+    @homework = HomeworkAttach.new
+    @homework.bid_id = @bid.id
+    @homework.user_id = User.current.id
+    @homework.save_attachments(params[:attachments])
+    @homework.save
+    @homework_list = @bid.homeworks
+    
+  end
+  
+  # 作业统计
+  def homework_statistics
+    @course = @bid.courses.first
+    @member = []
+    @course.memberships.each do |member|
+      unless (member.roles && Role.where('id = ? ', 3)).empty?
+        @member.push member
+      end
+    end
+    if @bid.homework_type = 1    
+      @student = User.where("id in (select DISTINCT user_id from #{HomeworkAttach.table_name} where bid_id = ? )", @bid.id)
+      @homework_type = true
+    else
+      
+      @homework_type = false
+    end
+    @user = @bid.author
+    render :layout => 'base_homework'
+  end
+  
+  def homework_respond
+    @user = @bid.author
+    render :layout => 'base_homework'
+  end
 
   def more
     @jour = @bid.journals_for_messages
@@ -291,6 +407,7 @@ class BidsController < ApplicationController
     #format.api { render_api_ok }
     end
   end
+  
 
   def back
     @jour = @bid.journals_for_messages
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 999544e7b..81192c597 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -19,8 +19,9 @@ class BoardsController < ApplicationController
   layout 'base_projects'#by young
   default_search_scope :messages
   before_filter :find_project_by_project_id, :find_board_if_available
-  before_filter :authorize, :except => [:new, :show, :create]
+  before_filter :authorize, :except => [:new, :show, :create, :index]
   accept_rss_auth :index, :show
+  
 
   helper :sort
   include SortHelper
@@ -33,6 +34,11 @@ class BoardsController < ApplicationController
       @board = @boards.first
       show
     end
+    if @project.project_type == 1
+      render :layout => 'base_courses'
+      else
+     render :layout => false if request.xhr?
+    end
   end
 
   def show
@@ -54,7 +60,11 @@ class BoardsController < ApplicationController
           preload(:author, {:last_reply => :author}).
           all
         @message = Message.new(:board => @board)
-        render :action => 'show', :layout => !request.xhr?
+        if @project.project_type
+          render :action => 'show', :layout => 'base_courses'
+        else
+          render :action => 'show', :layout => !request.xhr?
+        end
       }
       format.atom {
         @messages = @board.messages.
@@ -70,6 +80,9 @@ class BoardsController < ApplicationController
   def new
     @board = @project.boards.build
     @board.safe_attributes = params[:board]
+    if @project.project_type
+      render :layout => 'base_courses'
+    end
   end
 
   def create
@@ -90,6 +103,9 @@ class BoardsController < ApplicationController
   end
 
   def update
+    if @project.project_type
+      render :layout => 'base_courses'
+    end
     @board.safe_attributes = params[:board]
     if @board.save
       redirect_to_settings_in_projects
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
new file mode 100644
index 000000000..137079233
--- /dev/null
+++ b/app/controllers/courses_controller.rb
@@ -0,0 +1,42 @@
+class CoursesController < ApplicationController
+
+  
+  before_filter :require_login, :only => [:join, :unjoin]
+  
+  def join
+    if User.current.logged?
+      course = Project.find(params[:object_id])
+      if params[:course_password].to_i == Course.find_by_extra(course.identifier).state
+      members = []
+      members << Member.new(:role_ids => [5], :user_id => User.current.id)
+      course.members << members
+  
+      StudentsForCourse.create(:student_id => User.current.id, :course_id => params[:object_id])
+      @state = 0
+      else
+        @state = 1
+      end
+    end
+    respond_to do |format|
+      # format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
+      format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => Project.find(params[:object_id])} }
+    end
+  end
+  
+  def unjoin
+    if User.current.logged?
+      
+      @member = Member.where('project_id = ? and user_id = ?', params[:object_id], User.current.id)
+      @member.first.destroy
+            
+      joined = StudentsForCourse.where('student_id = ? and course_id = ?', User.current.id, params[:object_id])
+      joined.each do |join|
+        join.delete
+      end
+    end
+    respond_to do |format|
+      # format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
+      format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => Project.find(params[:object_id])} }
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index a311fc765..67c057eef 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -22,7 +22,7 @@ class DocumentsController < ApplicationController
   before_filter :find_project_by_project_id, :only => [:index, :new, :create]
   before_filter :find_model_object, :except => [:index, :new, :create]
   before_filter :find_project_from_association, :except => [:index, :new, :create]
-  before_filter :authorize #, :except => [:index]#Added by young
+  before_filter :authorize , :except => [:index]#Added by young
 
   helper :attachments
 
@@ -40,11 +40,18 @@ class DocumentsController < ApplicationController
       @grouped = documents.group_by(&:category)
     end
     @document = @project.documents.build
-    render :layout => false if request.xhr?
+    if @project.project_type == 1
+      render :layout => 'base_courses'
+    else
+      render :layout => false if request.xhr?
+    end
   end
 
   def show
     @attachments = @document.attachments.all
+    if @project.project_type
+          render :action => 'show', :layout => 'base_courses'
+    end
   end
 
   def new
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index cb4c1b8ff..1048c12bd 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -34,11 +34,20 @@ class FilesController < ApplicationController
 
     @containers = [ Project.includes(:attachments).reorder(sort_clause).find(@project.id)]
     @containers += @project.versions.includes(:attachments).reorder(sort_clause).all.sort.reverse
-    render :layout => !request.xhr?
+   
+    if @project.project_type == 1
+      render :layout => 'base_courses'
+    else
+      render :layout => !request.xhr? 
+    end
   end
 
   def new
     @versions = @project.versions.sort
+    @course_tag = @project.project_type
+    if @course_tag
+      render :layout => 'base_courses'
+    end
   end
 
   def create
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 27d195f0d..56422dcd6 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -49,7 +49,11 @@ class MessagesController < ApplicationController
       all
 
     @reply = Message.new(:subject => "RE: #{@message.subject}")
-    render :action => "show", :layout => "base_projects"#by young
+    if @message.board.project.project_type
+      render :action => "show", :layout => "base_courses"#by young
+    else
+      render :action => "show", :layout => "base_projects"#by young
+    end
   end
 
   # Create a new topic
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 48c6a7d59..91f04b4d2 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -77,7 +77,7 @@ class MyController < ApplicationController
       # ue.save
     # end
     
-     # added by bai     往数据库里写职业、性别和地区
+     # added by bai     �����ݿ���дְҵ���Ա�͵���
       if @user.user_extensions.nil?
        se = UserExtensions.new
        se.user_id = @user.id
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 91da55dda..bf02dabce 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -46,12 +46,18 @@ class NewsController < ApplicationController
     @newss = scope.all(:include => [:author, :project],
                                        :order => "#{News.table_name}.created_on DESC",
                                        :offset => @offset,
-                                       :limit => @limit)
-
+                                       :limit => @limit)  
+                                      
     respond_to do |format|
       format.html {
         @news = News.new # for adding news inline
+      # huang
+     
+    if @project.project_type == 1
+      render :layout => 'base_courses'  
+      else
         render :layout => false if request.xhr?
+      end
       }
       format.api
       format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
@@ -61,10 +67,18 @@ class NewsController < ApplicationController
   def show
     @comments = @news.comments
     @comments.reverse! if User.current.wants_comments_in_reverse_order?
+    @course_tag = @project.project_type
+    if @course_tag
+    render :layout => 'base_courses'
+    end
   end
 
   def new
     @news = News.new(:project => @project, :author => User.current)
+     @course_tag = @project.project_type
+    if @course_tag
+    render :layout => 'base_courses'
+    end
   end
 
   def create
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 926b6a648..9ad847dde 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -15,20 +15,40 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class ProjectsController < ApplicationController
+  # if @project.project_type == 1
   layout 'base_projects'# by young
   menu_item :overview
   menu_item :roadmap, :only => :roadmap
   menu_item :settings, :only => :settings
+  
   menu_item l(:label_sort_by_time), :only => :index
   menu_item l(:label_sort_by_active), :only => :index
   menu_item l(:label_sort_by_influence), :only => :index
-
-  before_filter :find_project, :except => [ :index, :search, :list, :new, :create, :copy ]
-  before_filter :authorize, :except => [:watcherlist, :index, :search, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, :statistics, :feedback, :project_respond]
+  
+  menu_item l(:label_homework), :only => :homework
+  menu_item l(:label_course_file), :only => :index
+  menu_item l(:label_course_news), :only => :index
+  # end
+  
+  
+  # layout 'base_courses'# by young
+  # menu_item :overview
+  # menu_item l(:label_homework), :only => :homework
+  # menu_item :files, :only => :files
+#   
+  # layout 'base_courses'
+  # menu_item l(:label_homework), :only => homework
+  # menu_item l(:label_course_file), :only => files  
+  # menu_item l(:label_settings), :only => settings
+
+  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join]
+  before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, :statistics, :feedback]
   before_filter :authorize_global, :only => [:new, :create]
-  before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
+  before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
   #by young
-  before_filter :member, :file, :statistics, :watcherlist
+  # before_filter :member, :file, :statistics, :watcherlist
+  # modified by fq
+  before_filter :file, :statistics, :watcherlist
   #
   accept_rss_auth :index
   accept_api_auth :index, :show, :create, :update, :destroy
@@ -39,6 +59,8 @@ class ProjectsController < ApplicationController
     end
   end
 
+  helper :bids
+  include BidsHelper
   helper :sort
   include SortHelper
   helper :custom_fields
@@ -222,6 +244,43 @@ class ProjectsController < ApplicationController
     end 
   end
 
+  # added by fq
+  def new_join
+    @course = Project.find(params[:object_id])
+  end
+
+  #Added by young
+  def homework
+    @offset, @limit = api_offset_and_limit({:limit => 10})
+    @bids = @project.homeworks
+    @bids = @bids.like(params[:name]) if params[:name].present?
+    @bid_count = @bids.count
+    @bid_pages = Paginator.new @bid_count, @limit, params['page']
+
+    @offset ||= @bid_pages.reverse_offset
+    #@bids = @bids.offset(@offset).limit(@limit).all.reverse
+    unless @offset == 0
+      @bids = @bids.offset(@offset).limit(@limit).all.reverse
+    else
+      limit = @bid_count % @limit
+      @bids = @bids.offset(@offset).limit(limit).all.reverse
+    end
+    render :layout => 'base_courses'
+   
+  end
+
+  def new_homework
+    if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 3, 7)).size >0))
+    @homework = Bid.new
+    @homework.safe_attributes = params[:bid]
+    render :layout => 'base_courses'
+    else
+      render_404
+    end
+      
+  end
+  #Ended by young
+
   def feedback
     @jours = @project.journals_for_messages.reverse
     @limit =  10
@@ -269,18 +328,36 @@ class ProjectsController < ApplicationController
   end
 
   def new
+    @course_tag = params[:course]
     @issue_custom_fields = IssueCustomField.sorted.all
     @trackers = Tracker.sorted.all
     @project = Project.new
     @project.safe_attributes = params[:project]
+    ##add by huang
+    @course=Course.new
+    @course.safe_attributes = params[:course]
+    ##end
     render :layout => 'base'
   end
 
   def create
+    @course_tag = params[:project][:project_type]
+    if(@course_tag=="1")
+      @course = Course.new
+      @course.extra='course' + DateTime.parse(Time.now.to_s).strftime('%Y-%m-%d_%H-%M-%S').to_s
+      @course.safe_attributes = params[:project][:course]
+      @course.tea_id = User.current.id
+      @course.save
+       # project = ProjectInfo.create(:user_id => User.current.id, :project_id => @project.id)
+        # project_status = ProjectStatus.create(:project_id => @project.id)
+    end
     @issue_custom_fields = IssueCustomField.sorted.all
     @trackers = Tracker.sorted.all
     @project = Project.new
     @project.safe_attributes = params[:project]
+    if @course_tag == '1'
+      @project.identifier = @course.extra
+    end
 
     if validate_parent_id && @project.save
       @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
@@ -300,7 +377,12 @@ class ProjectsController < ApplicationController
           flash[:notice] = l(:notice_successful_create)
           if params[:continue]
             attrs = {:parent_id => @project.parent_id}.reject {|k,v| v.nil?}
-            redirect_to new_project_path(attrs)
+            redirect_to new_project_path(attrs, :course => '0')
+          #Added by young
+
+          elsif params[:course_continue]
+            redirect_to new_project_path(:course => '1')
+          #Ended by young
           else
             redirect_to settings_project_path(@project)
           end
@@ -358,7 +440,6 @@ class ProjectsController < ApplicationController
 	@user = User.find_by_id(ProjectInfo.find_by_project_id(@project.id).user_id)
 	
     cond = @project.project_condition(Setting.display_subprojects_issues?)
-
     @open_issues_by_tracker = Issue.visible.open.where(cond).count(:group => :tracker)
     @total_issues_by_tracker = Issue.visible.where(cond).count(:group => :tracker)
 
@@ -378,7 +459,9 @@ class ProjectsController < ApplicationController
       "show_issues" => true,
       "show_files" => true,
       "show_documents" => true,
-      "show_messages" => true
+      "show_messages" => true,
+      "show_news" => true,
+      "show_bids" => true
     }
     @date_to ||= Date.today + 1
     @date_from = @date_to - @days
@@ -415,8 +498,9 @@ class ProjectsController < ApplicationController
     end
     @document = @project.documents.build
     #
+    @base_courses_tag = @project.project_type
     respond_to do |format|
-      format.html
+      format.html{render :layout => 'base_courses' if @base_courses_tag==1}
       format.api
     end
   end
@@ -427,6 +511,16 @@ class ProjectsController < ApplicationController
     @member ||= @project.members.new
     @trackers = Tracker.sorted.all
     @wiki ||= @project.wiki
+    #Added by young
+    # @course_tag = params[:course]
+    # if @course_tag == '1'
+    if @project.project_type == 1
+      @course = Course.find_by_extra(@project.identifier)
+      render :layout => 'base_courses'
+    else
+      render :layout => 'base_projects'
+    end
+  #Ended by young
   end
 
   def edit
@@ -434,9 +528,27 @@ class ProjectsController < ApplicationController
 
   #by young
   def member
+    if @project.project_type == 1
+      render :layout => 'base_courses'
+    end
   end
+  
+   # def news
+    # if @project.project_type == 1
+      # render :layout => 'base_courses'
+    # end
+  # end
 
   def file
+    # if @project.project_type == 1
+      # render :layout => 'base_courses'
+    # end
+    # @course_tag = params[:course]
+    # if @course_tag == '1'
+      # render :layout => 'base_courses'
+    # end
+    
+    # User.current
   end
 
   def statistics
@@ -447,6 +559,10 @@ class ProjectsController < ApplicationController
   def update
     @project.safe_attributes = params[:project]
     if validate_parent_id && @project.save
+      @course = Course.find_by_extra(@project.identifier)
+      @course.state = params[:project][:course][:state]
+      @course.term = params[:project][:course][:term]
+      @course.save             
       @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id')
             
       if params[:project][:is_public] == '0'
@@ -459,7 +575,7 @@ class ProjectsController < ApplicationController
       respond_to do |format|
         format.html {
           flash[:notice] = l(:notice_successful_update)
-          redirect_to settings_project_path(@project)
+          redirect_to settings_project_path(@project,:course => @project.project_type)
         }
         format.api  { render_api_ok }
       end
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 94de4bfbb..61a3bfb51 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -43,15 +43,26 @@ class RepositoriesController < ApplicationController
     @repository = Repository.factory(scm)
     @repository.is_default = @project.repository.nil?
     @repository.project = @project
-    render :layout => 'base_projects'
+    @course_tag = params[:course]
+    if @course_tag == 1
+      render :layout => 'base_courses'
+    else
+      render :layout => 'base_projects'
+    end
   end
   
+  
   def newrepo
     scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
     @repository = Repository.factory(scm)
     @repository.is_default = @project.repository.nil?
     @repository.project = @project
-    render :layout => 'base_projects'
+    @course_tag = params[:course]
+    if @course_tag == 1
+      render :layout => 'base_courses'
+    else
+      render :layout => 'base_projects'
+    end
   end
   
   def fork
@@ -209,7 +220,12 @@ class RepositoriesController < ApplicationController
       @changesets = @repository.latest_changesets(@path, @rev)
       @properties = @repository.properties(@path, @rev)
       @repositories = @project.repositories
-      render :action => 'show', :layout => 'base_projects'
+      @course_tag = params[:course]
+      if @course_tag == 1
+        render :action => 'show', :layout => 'base_courses'
+      else
+        render :action => 'show', :layout => 'base_projects'
+      end
     end
   end
 
@@ -369,6 +385,8 @@ class RepositoriesController < ApplicationController
   end
 
   def stats
+    @project_id = params[:id]
+    @repository_id = @repository.identifier
     render :layout => 'base_projects'
   end
 
diff --git a/app/controllers/teachers_controller.rb b/app/controllers/teachers_controller.rb
new file mode 100644
index 000000000..b4d0c4839
--- /dev/null
+++ b/app/controllers/teachers_controller.rb
@@ -0,0 +1,5 @@
+class TeachersController < ApplicationController
+  def show
+  
+  end
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index fa8879921..825c79060 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -17,21 +17,23 @@
 class UsersController < ApplicationController
   layout 'base_users'
   #Added by young
-  menu_item :activity 
+  menu_item :activity
   menu_item :user_information, :only => :info
   menu_item :user_project, :only => :user_projects
   menu_item :requirement_focus, :only => :watch_bids
   menu_item :user_newfeedback, :only => :user_newfeedback
+  menu_item :user_course, :only => :user_courses
   #Ended by young
 
  
-  before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info, :user_watchlist, :user_fanslist,:edit,:update]
-  before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, 
+  before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info, :user_watchlist, :user_fanslist,:update, :user_courses] 
+  #edit has been deleted by huang, 2013-9-23
+  before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
                                   :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info]
   accept_api_auth :index, :show, :create, :update, :destroy,:tag_save
   
   #william
-  before_filter :require_login,:only => :tag_save
+  before_filter :require_login, :only => :tag_save
 
 
   helper :sort
@@ -117,6 +119,68 @@ class UsersController < ApplicationController
     end
   end
   # end
+  
+  # added by fq
+  def user_courses
+    case params[:type]
+       when "2"
+      @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
+  
+      @memberships = []
+      @membership.each do |membership|
+        if  membership.project.project_type == 1
+          @membership << membership
+        end     
+    end
+    @state = 2
+      
+    when "1"
+      @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
+  
+      @memberships = []
+      @membership.each do |membership|
+        if membership.project.project_type == 1
+          @memberships << membership 
+        end
+      end
+      @bid = []
+      @memberships.each do |membership|
+      @bid += membership.project.homeworks
+      end
+      @bid = @bid.group_by {|bid| bid.courses.first.id}
+      @state = 1
+        
+    else
+      @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))  
+      @memberships = []
+      @membership.each do |membership|
+        if membership.project.project_type == 1
+          @memberships << membership 
+        end
+      end
+      @state = 0
+    end
+
+    # events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 20)
+    # @events_by_day = events.group_by(&:event_date)
+    
+    # @state = 0
+
+  #add by huang
+    unless User.current.admin?
+      if !@user.active? #|| (@user != User.current  && @memberships.empty? && events.empty?)
+        render_404
+      return
+      end
+    end
+  #end
+  
+    # respond_to do |format|
+      # format.html
+      # format.api
+    # end
+  end
+  # end
 
 # modified by fq
   def user_newfeedback
diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index 29901aa6b..b06b8cbb3 100644
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -23,6 +23,41 @@ class WatchersController < ApplicationController
   def unwatch
     set_watcher(@watchables, User.current, false)
   end
+  
+  def join
+    if User.current.logged?
+      course = Project.find(params[:object_id])
+      if params[:course_password] == '123'
+      members = []
+      members << Member.new(:role_ids => [5], :user_id => User.current.id)
+      course.members << members
+  
+      StudentsForCourse.create(:student_id => User.current.id, :course_id => params[:object_id])
+      else
+      end
+    end
+    respond_to do |format|
+      # format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
+      format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => Project.find(params[:object_id])} }
+    end
+  end
+  
+  def unjoin
+    if User.current.logged?
+      
+      @member = Member.where('project_id = ? and user_id = ?', params[:object_id], User.current.id)
+      @member.first.destroy
+            
+      joined = StudentsForCourse.where('student_id = ? and course_id = ?', User.current.id, params[:object_id])
+      joined.each do |join|
+        join.delete
+      end
+    end
+    respond_to do |format|
+      # format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
+      format.js { render :partial => 'set_join', :locals => {:user => User.current, :course => Project.find(params[:object_id])} }
+    end
+  end
 
   before_filter :find_project, :authorize, :only => [:new, :create, :append, :destroy, :autocomplete_for_user]
   accept_api_auth :create, :destroy
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5204788cf..b8a3fd791 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -31,7 +31,18 @@ module ApplicationHelper
 
   extend Forwardable
   def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
-
+  
+  #Added by young
+  #Define the course menu's link class
+  def link_class(label)
+     if current_menu_item == label
+        @class = 'selected'
+     else
+        @class = ''
+     end
+     return @class
+  end
+  #Ended by young
   # Return true if user is authorized for controller/action, otherwise false
   def authorize_for(controller, action)
     User.current.allowed_to?({:controller => controller, :action => action}, @project)
diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb
index a4925343f..f61399c85 100644
--- a/app/helpers/attachments_helper.rb
+++ b/app/helpers/attachments_helper.rb
@@ -31,6 +31,15 @@ module AttachmentsHelper
         :locals => {:attachments => container.attachments, :options => options, :thumbnails => (options[:thumbnails] && Setting.thumbnails_enabled?)}
     end
   end
+  
+  def attach_delete(project)
+    if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, project.bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, project.bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 3, 7)).size >0) || project.user_id == User.current.id)
+      true
+    else
+      false
+    end
+    
+  end
 
   def render_api_attachment(attachment, api)
     api.attachment do
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 0d12a22ea..7dac3bf47 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -35,6 +35,7 @@ module ProjectsHelper
             {:name => 'activities', :action => :manage_project_activities, :partial => 'projects/settings/activities', :label => :enumeration_activities}
             ]
     tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
+    
   end
   
     def sort_project(state)
@@ -60,6 +61,20 @@ module ProjectsHelper
   end
 
   
+  #Added by young
+  def course_settings_tabs
+    tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'},
+            {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural},
+            # {:name => 'repositories', :action => :manage_repository, :partial => 'projects/settings/repositories', :label => :label_repository_plural},
+            {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural}
+            ]
+    tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
+    
+  end
+  #Ended by young
+  
+
+  
 
   def parent_project_select_tag(project)
     selected = project.parent
@@ -78,7 +93,13 @@ module ProjectsHelper
   # Renders the projects index
   def render_project_hierarchy(projects)
     render_project_nested_lists(projects) do |project|
-      s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")
+      #Modified by young
+        if (project.project_type==1)
+          s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")+"<span style='color:#F00;'>(#{l(:label_course)})</span>".html_safe
+        else
+          s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")
+        end
+      #Ended by young
       if project.description.present?
         #Delete by nie.
         # s << content_tag('td', textilizable(project.short_description, :project => project), :class => 'wiki description')
@@ -111,5 +132,18 @@ module ProjectsHelper
   def get_projects_by_tag(tag_name)
     Project.tagged_with(tag_name).order('updated_on desc')
   end
+  
+  # added by fq
+  def homework_type_option
+    type = []
+    option1 = []
+    option2 = []
+    option1 << '��ҵ�����Ը�����ʽ�ύ'
+    option1 << 1
+    option2 << '��ҵ��������Ŀ��ʽ�ύ'
+    option2 << 2
+    type << option1
+    type << option2
+  end
 
 end
diff --git a/app/helpers/teachers_helper.rb b/app/helpers/teachers_helper.rb
new file mode 100644
index 000000000..1015c8c9f
--- /dev/null
+++ b/app/helpers/teachers_helper.rb
@@ -0,0 +1,2 @@
+module TeachersHelper
+end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 32c4b6142..32b546078 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -64,9 +64,9 @@ module UsersHelper
   # added by fq
   # <div class="pagination" >
   # <ul>
-  # <li><%= link_to("所有动态", {:controller => 'users', :action => 'show'}) %></li>
-  # <li><%= link_to("只看自己", {:controller => 'users', :action => 'show', :type => 1}) %></li>
-  # <li><%= link_to("所有反馈", {:controller => 'users', :action => 'show', :type => 2}) %></li>
+  # <li><%= link_to("���ж�̬", {:controller => 'users', :action => 'show'}) %></li>
+  # <li><%= link_to("ֻ���Լ�", {:controller => 'users', :action => 'show', :type => 1}) %></li>
+  # <li><%= link_to("�����", {:controller => 'users', :action => 'show', :type => 2}) %></li>
   # </ul></div> 
   
   def show_activity(state)
@@ -90,6 +90,26 @@ module UsersHelper
     end
     content_tag('div', content, :class => "pagination")
   end
+  
+  def user_course(state)
+    content = ''.html_safe
+    case state
+    when 0
+      s = content_tag('span', '�ҵĿγ�', :class => "current-page")
+      content << content_tag('li', s)
+      content << content_tag('li', link_to('�ҵ���ҵ', {:controller => 'users', :action => 'user_courses', :type => 1}))
+    when 1
+      s = content_tag('span', '�ҵ���ҵ', :class => "current-page")
+      content << content_tag('li', link_to('�ҵĿγ�', {:controller => 'users', :action => 'user_courses'}))
+      content << content_tag('li', s, :class => "current-page")
+    when 2
+      s = content_tag('span', '�γ�֪ͨ', :class => "current-page")
+      content << content_tag('li', link_to('�γ�֪ͨ', {:controller => 'users', :action => 'user_courses'}))
+      content << content_tag('li', s, :class => "current-page")  
+    end
+    content_tag('div', content, :class => "pagination")
+
+  end
 
 # added by huang 
 def sort_user(state)
diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index 052c3fd25..2baee6479 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -45,6 +45,21 @@ module WatchersHelper
   
     link_to text, url, :remote => true, :method => method, :class => css
   end
+  
+  # added by fq
+  def join_in_course(course, user)
+    return '' unless user && user.logged?
+    joined = user.member_of?(course)
+    text = joined ? '退出课程' : '加入课程'
+    url_t = join_path(:object_id => course.id)
+    url_f = try_join_path(:object_id => course.id)
+    method = joined ? 'delete' : 'post'
+    if joined
+      link_to text, url_t, :remote => true, :method => method, :id => 'join', :confirm => l(:text_are_you_sure)
+    else
+      link_to text, url_f, :remote => true, :method => method, :id => 'join'
+    end       
+  end
 
   # Returns the css class used to identify watch links for a given +object+
   def watcher_css(objects)
diff --git a/app/models/bid.rb b/app/models/bid.rb
index ef51e9589..bb254b6dc 100644
--- a/app/models/bid.rb
+++ b/app/models/bid.rb
@@ -1,20 +1,26 @@
 ####by fq
 class Bid < ActiveRecord::Base
-  #attr_accessible :author_id, :budget, :deadline, :name, :description
+  attr_accessible :author_id, :budget, :deadline, :name, :description, :homework_type
   include Redmine::SafeAttributes
 
   belongs_to :author, :class_name => 'User', :foreign_key => :author_id
+  belongs_to :course
   has_many :biding_projects, :dependent => :destroy
   has_many :projects, :through => :biding_projects
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
+  has_many :homework_for_courses, :dependent => :destroy
+  has_many :courses, :through => :homework_for_courses, :source => :project
+  has_many :homeworks, :class_name => 'HomeworkAttach', :dependent => :destroy
+  
+  acts_as_attachable
 
   NAME_LENGTH_LIMIT = 60
   DESCRIPTION_LENGTH_LIMIT = 250
 
   validates_length_of :name, :maximum => NAME_LENGTH_LIMIT
   validates_length_of :description, :maximum => DESCRIPTION_LENGTH_LIMIT
-  validates_presence_of :author_id, :name, :deadline, :budget
+  validates_presence_of :author_id, :name, :deadline
   # validates_presence_of :deadline, :message => 'test'
   # validates_format_of :deadline, :with =>
   validates_format_of :deadline, :with => /^[\d]{4}[-][\d]{1,2}[-][\d]{1,2}$/
@@ -45,7 +51,7 @@ class Bid < ActiveRecord::Base
                 :author => :author,
                 :url => Proc.new {|o| {:controller => 'bids', :action => 'show', :id => o.id}}
 
-  acts_as_activity_provider :find_options => {:include => [:author]},
+  acts_as_activity_provider :find_options => {:include => [:projects, :author]},
                             :author_key => :author_id
                             
                             
@@ -53,6 +59,10 @@ class Bid < ActiveRecord::Base
     'description',
     'budget',
     'deadline'
+    
+  # safe_attributes 'name',
+    # 'description',
+    # 'deadline'
   
   def add_jour(user, notes, reference_user_id = 0)
     self.journals_for_messages << JournalsForMessage.new(:user_id => user.id, :notes => notes, :reply_id => reference_user_id)
diff --git a/app/models/course.rb b/app/models/course.rb
new file mode 100644
index 000000000..276cc7652
--- /dev/null
+++ b/app/models/course.rb
@@ -0,0 +1,20 @@
+class Course < ActiveRecord::Base
+  include Redmine::SafeAttributes
+  
+  attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term
+  belongs_to :project, :class_name => 'Project', :foreign_key => :extra # 定义一个project方法， 该方法通过extra来调用project表
+  belongs_to :teacher, :class_name => 'User', :foreign_key => :tea_id  # 定义一个方法teacher，该方法通过tea_id来调用User表
+  has_many :bid
+  validates_presence_of :state, :term
+  safe_attributes 'extra',
+  'time',
+  'name',
+  'extra',
+  'code',
+  'location',
+  'tea_id',
+  'state',
+  'term'
+ 
+
+end
diff --git a/app/models/homework_attach.rb b/app/models/homework_attach.rb
new file mode 100644
index 000000000..aea68abb5
--- /dev/null
+++ b/app/models/homework_attach.rb
@@ -0,0 +1,9 @@
+class HomeworkAttach < ActiveRecord::Base
+  attr_accessible :bid_id, :user_id
+  
+  belongs_to :user
+  belongs_to :bid
+  
+  acts_as_attachable
+  
+end
diff --git a/app/models/homework_for_course.rb b/app/models/homework_for_course.rb
new file mode 100644
index 000000000..7a440449a
--- /dev/null
+++ b/app/models/homework_for_course.rb
@@ -0,0 +1,8 @@
+class HomeworkForCourse < ActiveRecord::Base
+  attr_accessible :bid_id, :project_id
+  
+  belongs_to :bid
+  belongs_to :project
+  
+  
+end
diff --git a/app/models/journals_for_message_observer.rb b/app/models/journals_for_message_observer.rb
new file mode 100644
index 000000000..3bca47791
--- /dev/null
+++ b/app/models/journals_for_message_observer.rb
@@ -0,0 +1,7 @@
+# Added by young
+class JournalsForMessageObserver < ActiveRecord::Observer
+  def after_create(journal_for_message)
+    Mailer.journals_for_message_add(User.current, journal_for_message).deliver
+  end
+end
+
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 1db19f14e..ed942f0d3 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -26,6 +26,15 @@ class Mailer < ActionMailer::Base
   def self.default_url_options
     { :host => Setting.host_name, :protocol => Setting.protocol }
   end
+  
+  # Builds a Mail::Message object used to email recipients of the added journals for message.
+  #
+  # def journals_for_message_add(user, journals_for_message)
+    # @user = User.current
+    # @url = url_for(:controller => 'users', :action => 'user_newfeedback')
+    # mail :to => user.mail,
+      # :subject => "hello"
+  # end
 
   # Builds a Mail::Message object used to email recipients of the added issue.
   #
diff --git a/app/models/project.rb b/app/models/project.rb
index bd856f7d0..53e407246 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -53,13 +53,27 @@ class Project < ActiveRecord::Base
   has_many :changesets, :through => :repository
   # added by fq
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
+  has_many :homework_for_courses, :dependent => :destroy
+  has_many :homeworks, :through => :homework_for_courses, :source => :bid, :dependent => :destroy
+  has_many :students_for_courses, :dependent => :destroy
+  has_many :student, :through => :students_for_courses, :source => :user
+  # has_one :cour, :class_name => 'Course', :foreign_key => :extra, :dependent => :destroy
+  
   # end
   #ADDED BY NIE
-  has_many :project_infos, :dependent => :destroy
+  has_many :project_infos, :dependent => :destroy 
+  has_one :project_status, :class_name => "ProjectStatus", :dependent => :destroy
+  has_one :project_status, :class_name => "ProjectStatus", :dependent => :destroy
+  has_one :project_status, :class_name => "ProjectStatus", :dependent => :destroy
   has_one :project_status, :class_name => "ProjectStatus", :dependent => :destroy
   #end
+
   has_one :wiki, :dependent => :destroy
-  # Custom field for the project issues
+  ##added by xianbo
+  has_one :course, :dependent => :destroy ,:order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
+  accepts_nested_attributes_for :course
+  ##end 
+    # Custom field for the project issues
   has_and_belongs_to_many :issue_custom_fields,
                           :class_name => 'IssueCustomField',
                           :order => "#{CustomField.table_name}.position",
@@ -682,7 +696,10 @@ class Project < ActiveRecord::Base
     'custom_field_values',
     'custom_fields',
     'tracker_ids',
-    'issue_custom_field_ids'
+    'issue_custom_field_ids',
+    'project_type'
+     
+
 
   safe_attributes 'enabled_module_names',
     :if => lambda {|project, user| project.new_record? || user.allowed_to?(:select_project_modules, project) }
@@ -1027,6 +1044,10 @@ class Project < ActiveRecord::Base
   def update_position_under_parent
     set_or_update_position_under(parent)
   end
+  
+  def course
+    @course
+  end
 
   # Inserts/moves the project so that target's children or root projects stay alphabetically sorted
   def set_or_update_position_under(target_parent)
diff --git a/app/models/students_for_course.rb b/app/models/students_for_course.rb
new file mode 100644
index 000000000..597d74da6
--- /dev/null
+++ b/app/models/students_for_course.rb
@@ -0,0 +1,10 @@
+class StudentsForCourse < ActiveRecord::Base
+  attr_accessible :course_id, :student_id
+  
+  belongs_to :course, :class_name => 'Project', :foreign_key => :course_id
+  belongs_to :student, :class_name => 'User', :foreign_key => :student_id
+  
+  validates_presence_of :course_id, :student_id
+  validates_uniqueness_of :student_id, :scope => :course_id
+  
+end
diff --git a/app/models/teacher.rb b/app/models/teacher.rb
new file mode 100644
index 000000000..cf57a1be8
--- /dev/null
+++ b/app/models/teacher.rb
@@ -0,0 +1,13 @@
+class Teacher < ActiveRecord::Base
+  attr_accessible :course_code, :couurse_time, :location, :tea_name
+  include Redmine::SafeAttributes
+  
+  belongs_to :project
+  
+  safe_attributes'tea_name',
+  'location',
+  'couurse_time',
+  'course_code',
+  'extra'
+  
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 978170017..981ff5af5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -82,8 +82,13 @@ class User < Principal
   has_many :bids, :foreign_key => 'author_id', :dependent => :destroy
   has_many :journals_for_messages, :as => :jour, :dependent => :destroy
   has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
-  has_many :journal_replies
-  has_many :activities
+  has_many :journal_replies, :dependent => :destroy
+  has_many :activities, :dependent => :destroy
+  has_many :students_for_courses, :dependent => :destroy
+  has_many :courses, :through => :students_for_courses, :source => :project
+  has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
+  has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
+  has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   #####
 
@@ -150,13 +155,27 @@ class User < Principal
     self.journals_for_messages << JournalsForMessage.new(:user_id => user.id, :notes => notes, :reply_id => reference_user_id, :status => true)
   end
   
+  ### fq
+  def join_in?(course)
+    joined = StudentsForCourse.where('student_id = ? and course_id = ?', self.id, course.id)
+    if joined.size > 0
+      true
+    else
+      false
+    end
+  end
+  ## end
+  
   def count_new_jour
     count = self.new_jours.count
   end
 
   def set_mail_notification
+    ##add byxianbo
+    thread=Thread.new do
     self.mail_notification = Setting.default_notification_option if self.mail_notification.blank?
     true
+    end
   end
 
   def update_hashed_password
diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb
index 1c9dd6854..26ce15af6 100644
--- a/app/views/account/register.html.erb
+++ b/app/views/account/register.html.erb
@@ -1,173 +1,173 @@
-<!-- added by bai 增加地区-->
+<!-- added by bai ���ӵ���-->
 <script type="text/javascript" language="javascript">
 	function showcity(province, cityField) {
 	switch (province) {
-    case "北京" :
+    case "����" :
         var cityOptions = new Array(
-        "东城","西城","朝阳","丰台","石景山","海淀","门头沟",
-        "房山","通州","顺义","昌平","大兴","平谷","怀柔","密云","延庆");
+        "����","����","����","��̨","ʯ��ɽ","����","��ͷ��",
+        "��ɽ","ͨ��","˳��","��ƽ","����","ƽ��","����","����","����");
         break;
-    case "上海" :
+    case "�Ϻ�" :
         var cityOptions = new Array(
-        "崇明","黄浦","卢湾","徐汇","长宁","静安","普陀","闸北","虹口","杨浦","闵行",
-        "宝山","嘉定","浦东","金山","松江","青浦","南汇","奉贤");
+        "����","����","¬��","���","����","����","����","բ��","���","����","����",
+        "��ɽ","�ζ�","�ֶ�","��ɽ","�ɽ�","����","�ϻ�","����");
         break;
-    case "广东" :
+    case "�㶫" :
         var cityOptions = new Array(
-        "广州","深圳","珠海","东莞","中山","佛山","惠州","河源","潮州","江门","揭阳","茂名",
-        "梅州","清远","汕头","汕尾","韶关","顺德","阳江","云浮","湛江","肇庆");
+        "����","����","�麣","��ݸ","��ɽ","��ɽ","����","��Դ","����","����","����","ï��",
+        "÷��","��Զ","��ͷ","��β","�ع�","˳��","����","�Ƹ�","տ��","����");
         break;
-    case "江苏" :
+    case "����" :
         var cityOptions = new Array(
-        "南京","常熟","常州","海门","淮安","江都","江阴","昆山","连云港","南通",
-        "启东","沭阳","宿迁","苏州","太仓","泰州","同里","无锡","徐州","盐城",
-        "扬州","宜兴","仪征","张家港","镇江","周庄");
+        "�Ͼ�","����","����","����","����","����","����","��ɽ","���Ƹ�","��ͨ",
+        "����","����","��Ǩ","����","̫��","̩��","ͬ��","����","����","�γ�",
+        "����","����","����","�żҸ�","��","��ׯ");
         break;
-    case "重庆" :
+    case "����" :
         var cityOptions = new Array(
-        "万州","涪陵","渝中","大渡口","江北","沙坪坝","九龙坡","南岸","北碚","万盛",
-        "双挢","渝北","巴南","黔江","长寿","綦江","潼南","铜梁","大足","荣昌","壁山",
-        "梁平","城口","丰都","垫江","武隆","忠县","开县","云阳","奉节","巫山","巫溪",
-        "石柱","秀山","酉阳","彭水","江津","合川","永川","南川");
+        "����","����","����","��ɿ�","����","ɳƺ��","������","�ϰ�","����","��ʢ",
+        "˫��","�山","����","ǭ��","����","�뽭","����","ͭ��","����","�ٲ�","��ɽ",
+        "��ƽ","�ǿ�","�ᶼ","�潭","��¡","����","����","����","���","��ɽ","��Ϫ",
+        "ʯ��","��ɽ","����","��ˮ","����","�ϴ�","����","�ϴ�");
         break;
-    case "安徽" :
+    case "����" :
         var cityOptions = new Array(
-        "合肥","安庆","蚌埠","亳州","巢湖","滁州","阜阳","贵池","淮北","淮化","淮南",
-        "黄山","九华山","六安","马鞍山","宿州","铜陵","屯溪","芜湖","宣城");
+        "�Ϸ�","����","����","����","����","����","����","���","����","����","����",
+        "��ɽ","�Ż�ɽ","����","����ɽ","����","ͭ��","��Ϫ","�ߺ�","����");
          break;
-    case "福建" :
+    case "����" :
         var cityOptions = new Array(
-        "福州","厦门","泉州","漳州","龙岩","南平","宁德","莆田","三明");
+        "����","����","Ȫ��","����","����","��ƽ","����","����","����");
          break;
-    case "甘肃" :
+    case "����" :
         var cityOptions = new Array(
-        "兰州","白银","定西","敦煌","甘南","金昌","酒泉","临夏","平凉","天水",
-        "武都","武威","西峰","张掖");
+        "����","����","����","�ػ�","����","���","��Ȫ","����","ƽ��","��ˮ",
+        "�䶼","����","����","��Ҵ");
         break;
-    case "广西" :
+    case "����" :
         var cityOptions = new Array(
-        "南宁","百色","北海","桂林","防城港","贵港","河池","贺州","柳州","钦州","梧州","玉林");
+        "����","��ɫ","����","����","���Ǹ�","���","�ӳ�","����","����","����","����","����");
         break;
-    case "贵州" :
+    case "����" :
         var cityOptions = new Array(
-        "贵阳","安顺","毕节","都匀","凯里","六盘水","铜仁","兴义","玉屏","遵义");
+        "����","��˳","�Ͻ�","����","����","����ˮ","ͭ��","����","����","����");
         break;
-    case "海南" :
+    case "����" :
         var cityOptions = new Array(
-        "海口","儋县","陵水","琼海","三亚","通什","万宁");
+        "����","����","��ˮ","����","����","ͨʲ","����");
         break;
-    case "河北" :
+    case "�ӱ�" :
         var cityOptions = new Array(
-        "石家庄","保定","北戴河","沧州","承德","丰润","邯郸","衡水","廊坊","南戴河","秦皇岛",
-        "唐山","新城","邢台","张家口");
+        "ʯ��ׯ","����","������","����","�е�","����","����","��ˮ","�ȷ�","�ϴ���","�ػʵ�",
+        "��ɽ","�³�","��̨","�żҿ�");
         break;
-    case "黑龙江" :
+    case "������" :
         var cityOptions = new Array(
-        "哈尔滨","北安","大庆","大兴安岭","鹤岗","黑河","佳木斯","鸡西","牡丹江","齐齐哈尔",
-        "七台河","双鸭山","绥化","伊春");
+        "������","����","����","���˰���","�׸�","�ں�","��ľ˹","����","ĵ����","�������",
+        "��̨��","˫Ѽɽ","�绯","����");
         break;
-    case "河南" :
+    case "����" :
         var cityOptions = new Array(
-        "郑州","安阳","鹤壁","潢川","焦作","济源","开封","漯河","洛阳","南阳","平顶山",
-        "濮阳","三门峡","商丘","新乡","信阳","许昌","周口","驻马店");
+        "֣��","����","�ױ�","�괨","����","��Դ","����","���","����","����","ƽ��ɽ",
+        "���","����Ͽ","����","����","����","����","�ܿ�","פ����");
         break;
-    case "香港" :
+    case "���" :
         var cityOptions = new Array(
-        "香港","九龙","新界");
+        "���","����","�½�");
         break;
-    case "湖北" :
+    case "����" :
         var cityOptions = new Array(
-        "武汉","恩施","鄂州","黄冈","黄石","荆门","荆州","潜江","十堰","随州","武穴",
-        "仙桃","咸宁","襄阳","襄樊","孝感","宜昌");
+        "�人","��ʩ","����","�Ƹ�","��ʯ","����","����","DZ��","ʮ��","����","��Ѩ",
+        "����","����","����","�差","Т��","�˲�");
         break;
-    case "湖南" :
+    case "����" :
         var cityOptions = new Array(
-        "长沙","常德","郴州","衡阳","怀化","吉首","娄底","邵阳","湘潭","益阳","岳阳",
-        "永州","张家界","株洲");
+        "��ɳ","����","����","����","����","����","¦��","����","��̶","����","����",
+        "����","�żҽ�","����");
         break;
-    case "江西" :
+    case "����" :
         var cityOptions = new Array(
-        "南昌","抚州","赣州","吉安","景德镇","井冈山","九江","庐山","萍乡",
-        "上饶","新余","宜春","鹰潭");
+        "�ϲ�","����","����","����","������","����ɽ","�Ž�","®ɽ","Ƽ��",
+        "����","����","�˴�","ӥ̶");
         break;
-    case "吉林" :
+    case "����" :
         var cityOptions = new Array(
-        "长春","吉林","白城","白山","珲春","辽源","梅河","四平","松原","通化","延吉");
+        "����","����","�׳�","��ɽ","����","��Դ","÷��","��ƽ","��ԭ","ͨ��","�Ӽ�");
         break;
-    case "辽宁" :
+    case "����" :
         var cityOptions = new Array(
-        "沈阳","鞍山","本溪","朝阳","大连","丹东","抚顺","阜新","葫芦岛","锦州",
-        "辽阳","盘锦","铁岭","营口");
+        "����","��ɽ","��Ϫ","����","����","����","��˳","����","��«��","����",
+        "����","�̽�","����","Ӫ��");
         break;
-    case "澳门" :
-        var cityOptions = new Array("澳门");
+    case "����" :
+        var cityOptions = new Array("����");
         break;
-    case "内蒙古" :
+    case "���ɹ�" :
         var cityOptions = new Array(
-        "呼和浩特","阿拉善盟","包头","赤峰","东胜","海拉尔","集宁","临河","通辽","乌海",
-        "乌兰浩特","锡林浩特");
+        "���ͺ���","��������","��ͷ","���","��ʤ","������","����","�ٺ�","ͨ��","�ں�",
+        "��������","���ֺ���");
         break;
-    case "宁夏" :
+    case "����" :
         var cityOptions = new Array(
-        "银川","固源","石嘴山","吴忠");
+        "����","��Դ","ʯ��ɽ","����");
         break;
-    case "青海" :
+    case "�ຣ" :
         var cityOptions = new Array(
-        "西宁","德令哈","格尔木","共和","海东","海晏","玛沁","同仁","玉树");
+        "����","�����","���ľ","����","����","����","����","ͬ��","����");
         break;
-    case "山东" :
+    case "ɽ��" :
         var cityOptions = new Array(
-        "济南","滨州","兖州","德州","东营","菏泽","济宁","莱芜","聊城","临沂",
-        "蓬莱","青岛","曲阜","日照","泰安","潍坊","威海","烟台","枣庄","淄博");
+        "����","����","����","����","��Ӫ","����","����","����","�ij�","����",
+        "����","�ൺ","����","����","̩��","Ϋ��","����","��̨","��ׯ","�Ͳ�");
         break;
-    case "山西" :
+    case "ɽ��" :
         var cityOptions = new Array(
-        "太原","长治","大同","候马","晋城","离石","临汾","宁武","朔州","忻州",
-        "阳泉","榆次","运城");
+        "̫ԭ","����","��ͬ","����","����","��ʯ","�ٷ�","����","˷��","����",
+        "��Ȫ","�ܴ�","�˳�");
         break;
-    case "陕西" :
+    case "����" :
         var cityOptions = new Array(
-        "西安","安康","宝鸡","汉中","渭南","商州","绥德","铜川","咸阳","延安","榆林");
+        "����","����","����","����","μ��","����","���","ͭ��","����","�Ӱ�","����");
         break;
-    case "四川" :
+    case "�Ĵ�" :
         var cityOptions = new Array(
-        "成都","巴中","达川","德阳","都江堰","峨眉山","涪陵","广安","广元","九寨沟",
-        "康定","乐山","泸州","马尔康","绵阳","眉山","南充","内江","攀枝花","遂宁",
-        "汶川","西昌","雅安","宜宾","自贡","资阳");
+        "�ɶ�","����","�ﴨ","����","������","��üɽ","����","�㰲","��Ԫ","��կ��",
+        "����","��ɽ","����","������","����","üɽ","�ϳ�","�ڽ�","��֦��","����",
+        "�봨","����","�Ű�","�˱�","�Թ�","����");
         break;
-    case "台湾" :
+    case "̨��" :
         var cityOptions = new Array(
-        "台北","基隆","台南","台中","高雄","屏东","南投","云林","新竹","彰化","苗栗",
-        "嘉义","花莲","桃园","宜兰","台东","金门","马祖","澎湖");
+        "̨��","��¡","̨��","̨��","����","����","��Ͷ","����","����","�û�","����",
+        "����","����","��԰","����","̨��","����","����","���");
         break;
-    case "天津" :
+    case "���" :
         var cityOptions = new Array(
-        "天津","和平","东丽","河东","西青","河西","津南","南开","北辰","河北","武清","红挢",
-        "塘沽","汉沽","大港","宁河","静海","宝坻","蓟县");
+        "���","��ƽ","����","�Ӷ�","����","����","����","�Ͽ�","����","�ӱ�","����","����",
+        "����","����","���","����","����","����","����");
         break;
-    case "新疆" :
+    case "�½�" :
         var cityOptions = new Array(
-        "乌鲁木齐","阿克苏","阿勒泰","阿图什","博乐","昌吉","东山","哈密","和田","喀什",
-        "克拉玛依","库车","库尔勒","奎屯","石河子","塔城","吐鲁番","伊宁");
+        "��³ľ��","������","����̩","��ͼʲ","����","����","��ɽ","����","����","��ʲ",
+        "��������","�⳵","�����","����","ʯ����","����","��³��","����");
         break;
-    case "西藏" :
+    case "����" :
         var cityOptions = new Array(
-        "拉萨","阿里","昌都","林芝","那曲","日喀则","山南");
+        "����","����","����","��֥","����","�տ���","ɽ��");
         break;
-    case "云南" :
+    case "����" :
         var cityOptions = new Array(
-        "昆明","大理","保山","楚雄","大理","东川","个旧","景洪","开远","临沧","丽江",
-        "六库","潞西","曲靖","思茅","文山","西双版纳","玉溪","中甸","昭通");
+        "����","����","��ɽ","����","����","����","����","����","��Զ","�ٲ�","����",
+        "����","º��","����","˼é","��ɽ","��˫����","��Ϫ","�е�","��ͨ");
         break;
-    case "浙江" :
+    case "�㽭" :
         var cityOptions = new Array(
-        "杭州","安吉","慈溪","定海","奉化","海盐","黄岩","湖州","嘉兴","金华","临安",
-        "临海","丽水","宁波","瓯海","平湖","千岛湖","衢州","江山","瑞安","绍兴","嵊州",
-        "台州","温岭","温州","余姚","舟山");
+        "����","����","��Ϫ","����","�","����","����","����","����","��","�ٰ�",
+        "�ٺ�","��ˮ","����","걺�","ƽ��","ǧ����","����","��ɽ","��","����","����",
+        "̨��","����","����","��Ҧ","��ɽ");
         break;
-    case "海外" :
+    case "����" :
         var cityOptions = new Array(
-        "美国","日本","英国","法国","德国","其他");
+        "����","�ձ�","Ӣ��","����","�¹�","����");
         break;
     default:
         var cityOptions = new Array("");
@@ -187,7 +187,7 @@
 }
 </script>
 
-<!-- added by bai 增加职称-->
+<!-- added by bai ����ְ��-->
 <script type="text/javascript" language="javascript">
 	function showtechnical_title(identity, technical_titleField) {
 	switch (identity) {
@@ -196,7 +196,7 @@
     	$('#technical_title').show()
     	$('#no').hide()
         var technical_titleOptions = new Array(
-        "教授","副教授","讲师","助教");
+        "����","������","��ʦ","����");
         
         break;
         
@@ -253,25 +253,25 @@
 	<em class="info"><%="#{l(:label_mail_attention)} "%></em></p>
 <p><%= f.select :language, lang_options_for_select %></p>
 
-<!-- added by bai  增加了身份、性别、地区和教师的职称-->
+<!-- added by bai  ���������ݡ��Ա𡢵����ͽ�ʦ��ְ��-->
 
 
 <p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_identity) %><span class="required"> *</span></strong></td>
 	          <td class="info" style="width: 10px">
 	          
 	          	<select onchange="showtechnical_title(this.value, document.getElementById(&#39;userTechnical_title&#39;));" name="identity" id="userProvince">
-	<option value="">--请选择身份--</option>
-	<option value="0">教师</option> 
-	<option value="1">学生</option> 
-	<option value="2">企业</option> 
-	<option value="3">开发者</option> 
+	<option value="">--��ѡ������--</option>
+	<option value="0">��ʦ</option> 
+	<option value="1">ѧ��</option> 
+	<option value="2">��ҵ</option> 
+	<option value="3">������</option> 
 	
 </select></td>
 <td class="info" style="width: 100px">
 <span id = 'technical_title' style = 'display:none'>	
 <select name="technical_title" id="userTechnical_title"></select></span>
 <span id = 'no' style = 'display:none'>	
-<input name="no" id="no" placeholder="请输入学号"></select></span>
+<input name="no" id="no" placeholder="������ѧ��"></select></span>
 
 </td></tr></table></p>
 <!-- end -->
@@ -286,42 +286,42 @@
 <p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_location) %></strong></td>
 	          <td class="info" style="width: 80px">
 	<select onchange="showcity(this.value, document.getElementById(&#39;userCity&#39;));" name="province" id="userProvince">
-	<option value="">--请选择省份--</option>
-	<option value="北京">北京</option> 
-	<option value="上海">上海</option> 
-	<option value="广东">广东</option> 
-	<option value="江苏">江苏</option> 
-	<option value="浙江">浙江</option> 
-	<option value="重庆">重庆</option> 
-	<option value="安徽">安徽</option> 
-	<option value="福建">福建</option> 
-	<option value="甘肃">甘肃</option> 
-	<option value="广西">广西</option> 
-	<option value="贵州">贵州</option> 
-	<option value="海南">海南</option> 
-	<option value="河北">河北</option> 
-	<option value="黑龙江">黑龙江</option> 
-	<option value="河南">河南</option> 
-	<option value="湖北">湖北</option> 
-	<option value="湖南">湖南</option> 
-	<option value="江西">江西</option> 
-	<option value="吉林">吉林</option> 
-	<option value="辽宁">辽宁</option> 
-	<option value="内蒙古">内蒙古</option> 
-	<option value="宁夏">宁夏</option> 
-	<option value="青海">青海</option> 
-	<option value="山东">山东</option> 
-	<option value="山西">山西</option> 
-	<option value="陕西">陕西</option> 
-	<option value="四川">四川</option> 
-	<option value="天津">天津</option> 
-	<option value="新疆">新疆</option> 
-	<option value="西藏">西藏</option> 
-	<option value="云南">云南</option> 
-	<option value="香港">香港特别行政区</option> 
-	<option value="澳门">澳门特别行政区</option>
-	<option value="台湾">台湾</option> 
-	<option value="海外">海外</option>
+	<option value="">--��ѡ��ʡ��--</option>
+	<option value="����">����</option> 
+	<option value="�Ϻ�">�Ϻ�</option> 
+	<option value="�㶫">�㶫</option> 
+	<option value="����">����</option> 
+	<option value="�㽭">�㽭</option> 
+	<option value="����">����</option> 
+	<option value="����">����</option> 
+	<option value="����">����</option> 
+	<option value="����">����</option> 
+	<option value="����">����</option> 
+	<option value="����">����</option> 
+	<option value="����">����</option> 
+	<option value="�ӱ�">�ӱ�</option> 
+	<option value="������">������</option> 
+	<option value="����">����</option> 
+	<option value="����">����</option> 
+	<option value="����">����</option> 
+	<option value="����">����</option> 
+	<option value="����">����</option> 
+	<option value="����">����</option> 
+	<option value="���ɹ�">���ɹ�</option> 
+	<option value="����">����</option> 
+	<option value="�ຣ">�ຣ</option> 
+	<option value="ɽ��">ɽ��</option> 
+	<option value="ɽ��">ɽ��</option> 
+	<option value="����">����</option> 
+	<option value="�Ĵ�">�Ĵ�</option> 
+	<option value="���">���</option> 
+	<option value="�½�">�½�</option> 
+	<option value="����">����</option> 
+	<option value="����">����</option> 
+	<option value="���">����ر�������</option> 
+	<option value="����">�����ر�������</option>
+	<option value="̨��">̨��</option> 
+	<option value="����">����</option>
 </select></td>
 <td class="info" style="width: 100px">
 <select name="city" id="userCity"></select></td></tr></table></p>
diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index d2ab22ced..81eb416af 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -9,11 +9,19 @@
   <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
   <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
   <% if options[:deletable] %>
+  	<% unless attachment.container_type == 'HomeworkAttach' %>
     <%= link_to image_tag('delete.png'), attachment_path(attachment),
                                          :data => {:confirm => l(:text_are_you_sure)},
                                          :method => :delete,
                                          :class => 'delete',
                                          :title => l(:button_delete) %>
+    <% else %>                                  
+  	<%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'delete_homework', :id => attachment.id},
+                                         :data => {:confirm => l(:text_are_you_sure)},
+                                         :method => :delete,
+                                         :class => 'delete',
+                                         :title => l(:button_delete) %>
+  	<% end %>
   <% end %>
   <% if options[:author] %>
     <span class="author"><%= h(attachment.author) %>, <%= format_time(attachment.created_on) %></span>
diff --git a/app/views/attachments/delete.js.erb b/app/views/attachments/delete.js.erb
new file mode 100644
index 000000000..3cfb5845f
--- /dev/null
+++ b/app/views/attachments/delete.js.erb
@@ -0,0 +1 @@
+$('#attachments_<%= j params[:attachment_id] %>').remove();
diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
new file mode 100644
index 000000000..cea2165d4
--- /dev/null
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -0,0 +1,46 @@
+<!-- huang -->
+<% bids.each do |bid|%>
+
+<table width="95%" border="0" style="padding-left: 10px; padding-top: 10px;">
+	<tr>
+		<td colspan="2" valign="top" width="50" ><%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %></td>
+		<td>
+		<table width="100%" border="0">
+			<tr>
+				<td colspan="2" valign="top"><strong><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>: &nbsp;<%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></strong></td>
+			</tr>
+			<tr>
+				<td width="500">
+				<table border="0">
+					<tr>
+						<td> <% if bid.reward_type.nil? or bid.reward_type == 1 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %>
+							<%= bid.budget%></span></strong> <% elsif bid.reward_type == 2 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> <% else %> 
+							<!-- <strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %>&nbsp;<%= bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong> --> 
+							<% end %> <!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> --></td>
+					</tr>
+					<tr>
+						<td><span class="font_lighter"><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></strong>)</span><span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span></td>
+					</tr>
+				</table></td>
+				<td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td>
+			</tr>
+			<tr>
+				<td>
+				<div class="bid-description" style="border-left:  1px solid rgb(225, 225, 225); border-bottom: 1px solid rgb(225, 225, 225); padding-left: 20px; padding-bottom: 10px; margin-bottom: 20px;">
+					<table width="100%">
+						<tr>
+							<td> <%= bid.description%> </td>
+						</tr>
+					</table>
+				</div></td>
+			</tr>
+		</table></td>
+	</tr>
+</table>
+<% end %>
+<div class="pagination">
+	<ul>
+		<%= pagination_links_full bid_pages %>
+		<ul>
+</div>
+<!--end-->
diff --git a/app/views/bids/_bid_show.html.erb b/app/views/bids/_bid_show.html.erb
index 40760e12f..21e4e30bb 100644
--- a/app/views/bids/_bid_show.html.erb
+++ b/app/views/bids/_bid_show.html.erb
@@ -1,14 +1,68 @@
 <!-- fq -->
-
 <% bids.each do |bid|%>
 
 <table width="95%" border="0" style="padding-left: 10px; padding-top: 10px;">
+	<tr>
+		<td colspan="2" valign="top" width="50" ><%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %></td>
+		<td>
+		<table width="100%" border="0">
+			<tr>
+				<td colspan="2" valign="top"><strong><%= link_to(bid.author, user_path(bid.author), :class => 'bid_user') %>: &nbsp;<%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></strong></td>
+			</tr>
+			<tr>
+				<td width="500">
+				<table border="0">
+					<tr>
+						<td> <% if bid.reward_type.nil? or bid.reward_type == 1%> <strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %><%= bid.budget%></span></strong> <% elsif bid.reward_type == 2%> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> <% else %> <!-- <strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %>&nbsp;<%= bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong> --> <% end %> <!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> --></td>
+					</tr>
+					<% unless bid.reward_type == 3 %>
+					<tr>
+						<td><span class="font_lighter"><%= l(:label_x_biding_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid) %></strong>)</span>
+							<span class="font_lighter"><%= l(:label_x_bids_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span>
+							<span class="font_lighter"> <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<strong><%= link_to bid.watcher_users.count, respond_path(bid) %></strong>)</span></td>
+					</tr>
+					<% else %>
+					<tr>
+						<td><span class="font_lighter"><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid) %></strong>)
+							</span><span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span>
+							<span class="font_lighter"> <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<strong><%= link_to bid.watcher_users.count, respond_path(bid) %></strong>)</span></td>
+					</tr>
+					<% end %>
+				</table></td>
+				<td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td>
+			</tr>
+			<tr>
+				<td>
+				<div class="bid-description" style="border-left:  1px solid rgb(225, 225, 225); border-bottom: 1px solid rgb(225, 225, 225); padding-left: 20px; padding-bottom: 10px; margin-bottom: 20px;">
+					<table width="100%">
+						<tr>
+							<td> <%= bid.description%> </td>
+						</tr>
+					</table>
+				</div></td>
+			</tr>
+		</table></td>
+	</tr>
+</table>
+<% end %>
+<div class="pagination">
+	<ul>
+		<%= pagination_links_full bid_pages %>
+		<ul>
+</div>
+
+<!--new-->
+<!-- <% bids.each do |bid|%>
+<table width="98%" border="0" style="padding-left: 20px; padding-top: 10px;">
 <tr>
-<td colspan="2" valign="top" width="50" ><%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %></td>
+<td valign="top" width="50px"><%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %></td>
 <td>
-<table width="100%" border="0">
+<table width="100%" border="0" class="font_description">
 <tr>
-<td colspan="2" valign="top"><strong><%= link_to(bid.author, user_path(bid.author), :class => 'bid_user') %>: &nbsp;<%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></strong></td>
+<td><strong><%= link_to(bid.author, user_path(bid.author)) %></strong>
+<spanclass="font_lighter">
+<%= l(:label_bid_publish) %></span> <strong><%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></strong>
+</td>
 </tr>
 <tr>
 <td width="500">
@@ -32,17 +86,19 @@
 						</td>
 					</tr>
 				</table></td>
-<td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td>
+<td  width="200px" valign="bottom" style="padding-bottom: 5px">
+<table>
+<tr>
+<td style="float: right"><span><%= l(:label_bid_project) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid),:class=> "bids_user" %>)</span></td>
 </tr>
 <tr>
-<td>
-<div class="bid-description" style="border-left:  1px solid rgb(225, 225, 225); border-bottom: 1px solid rgb(225, 225, 225); padding-left: 20px; padding-bottom: 10px; margin-bottom: 20px;">
-<table width="100%">
+<td style="float: right"><span><%= l(:label_responses) %>(<%= link_to bid.commit, respond_path(bid),:class=> "bids_user" %>)</span></td>
+</tr>
 <tr>
-<td> <%= bid.description%> </td>
+<td style="float: right"><span><%= l(:label_followers) %>(<%= link_to bid.watcher_users.count, respond_path(bid),:class=> "bids_user" %>)</span></td>
 </tr>
-</table>
-</div></td>
+<tr>
+<td><span style="float: right"><%= l(:field_deadline) %><span class="font_lighter" ><%= format_time bid.created_on %></span></span></td>
 </tr>
 </table></td>
 </tr>
@@ -52,56 +108,4 @@
 <ul>
 <%= pagination_links_full bid_pages %>
 <ul>
-</div> 
-
-<!--new-->
-<!-- <% bids.each do |bid|%>
-<table width="98%" border="0" style="padding-left: 20px; padding-top: 10px;">
-	<tr>
-		<td valign="top" width="50px"><%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %></td>
-		<td>
-		<table width="100%" border="0" class="font_description">
-			<tr>
-				<td><strong><%= link_to(bid.author, user_path(bid.author)) %></strong>
-				<spanclass="font_lighter">
-					<%= l(:label_bid_publish) %></span> <strong><%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></strong>
-				</td>
-			</tr>
-			<tr>
-
-				<% if bid.reward_type.nil? or bid.reward_type == 1%>
-				<td><strong><%= l(:label_bids_reward_method) %><span style="color: rgb(255, 0, 0);font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %>&nbsp;<%= bid.budget%><%= l(:label_RMB_sign) %></span></strong></td>
-				<% elsif bid.reward_type == 2%>
-				<td><strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong></td>
-				<% else %>
-				<td><strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑">学分&nbsp;<%= bid.budget%>分</span></strong></td>
-				<% end %>
-			</tr>
-			<tr>
-				<td style="border-left:  1px solid rgb(225, 225, 225); border-bottom: 1px solid rgb(225, 225, 225); padding-left: 20px; padding-bottom: 20px; margin-bottom: 20px;"> <%= bid.description%> </td>
-			</tr>
-
-		</table></td>
-		<td  width="200px" valign="bottom" style="padding-bottom: 5px">
-		<table>
-			<tr>
-				<td style="float: right"><span><%= l(:label_bid_project) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid),:class=> "bids_user" %>)</span></td>
-			</tr>
-			<tr>
-				<td style="float: right"><span><%= l(:label_responses) %>(<%= link_to bid.commit, respond_path(bid),:class=> "bids_user" %>)</span></td>
-			</tr>
-			<tr>
-				<td style="float: right"><span><%= l(:label_followers) %>(<%= link_to bid.watcher_users.count, respond_path(bid),:class=> "bids_user" %>)</span></td>
-			</tr>
-			<tr>
-				<td><span style="float: right"><%= l(:field_deadline) %><span class="font_lighter" ><%= format_time bid.created_on %></span></span></td>
-			</tr>
-		</table></td>
-	</tr>
-</table>
-<% end %>
-<div class="pagination">
-	<ul>
-		<%= pagination_links_full bid_pages %>
-		<ul>
-			</div> -->
+</div> -->
diff --git a/app/views/bids/_form.html.erb b/app/views/bids/_form.html.erb
index da3e3b35b..3416378f9 100644
--- a/app/views/bids/_form.html.erb
+++ b/app/views/bids/_form.html.erb
@@ -26,7 +26,7 @@
 <p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :placeholder => "#{l(:label_requirement_name)}" %></p>
 
 <p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT, :placeholder => "#{l(:label_requirement_description)}" %></p>
-<p><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe, 
+<p><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe, 
 	:onChange => "show('bid_reward_type', 'bid_budget', '"+l(:label_bids_reward_what)+"','"+l(:label_bids_new_money)+"','"+l(:label_bids_new_credit)+"','"+l(:label_bids_new_content)+"')" %>
 	<%= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
 </p>
diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb
index aac579d7b..922c6445c 100644
--- a/app/views/bids/_history.html.erb
+++ b/app/views/bids/_history.html.erb
@@ -1,7 +1,14 @@
 <!-- added by fq -->
-<table width="660px" border="0" align="center">
-<tr>
-	<td class="font_lighter" style="font-size: 15px;"><%=l(:label_user_response)%></td>
+<table width="660px" border="0" align="center" style="padding-left: 26px">
+<tr><td>
+	<!-- modified by huang -->
+	<% if @bid.reward_type ==3 %>
+	<td class="font_lighter" style="font-size: 15px;"><%=l(:label_student_response)%></td>
+	<% else %>
+	<td class="font_lighter" style="font-size: 15px;"><%=l(:label_user_response)%></td>	
+	<% end %>
+	</td>
+ <!-- end -->
 </tr></table>
 
 
@@ -18,8 +25,13 @@
     <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %></td>
     <td><table width="580px" border="0">
       <tr>
-        <td colspan="2" valign="top"><strong> <%=link_to journal.user, user_path(journal.user)%></strong> <span class="font_lighter"><%= l(:label_respond_requirement) %></span></td>
+      	<% if @bid.reward_type == 3 %>      	
+        <td colspan="2" valign="top"><strong> <%=link_to journal.user, user_path(journal.user)%></strong> <span class="font_lighter"><%= l(:label_question_requirement) %></span></td>
+        <% else %>
+        <td colspan="2" valign="top"><strong> <%=link_to journal.user, user_path(journal.user)%></strong> <span class="font_lighter"><%= l(:label_respond_requirement) %></span></td>      
+        <% end %>
         </tr>
+        
       <tr>
         <td colspan="2" width="580px" ><p class="font_description"><%= textilizable journal.notes%></p></td>
         </tr>
diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb
new file mode 100644
index 000000000..3d6ded4fc
--- /dev/null
+++ b/app/views/bids/_homework.html.erb
@@ -0,0 +1,22 @@
+<div id="put-bid-form" style="display: none">
+	<%= form_for "bid_for_save", :remote=>true, :url => {:controller => 'bids', :action => 'add_homework'},
+	:update => "bidding_project_list",
+	:complete => '$("#put-bid-form").hide();' do |f| %>
+<fieldset><legend><%= l(:label_attachment_plural) %></legend>
+<p><%= render :partial => 'attachments/form', :locals => {:container => @homework} %></p>
+</fieldset>
+<%= submit_tag l(:button_create) %>
+<% end %>
+</div>
+<% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %>
+
+<div class='icon icon-add'>
+	<%= toggle_link l(:button_bidding_homework), 'put-bid-form' %>
+</div>
+<% elsif @homework_list.empty? %>
+	<div class="font_lighter_sidebar" style="padding-left: 10px">暂无学生提交作业！</div>
+<% end %>
+
+<div id='bidding_project_list'>
+	<%= render :partial => 'homework_list', :locals => {:homework => @homework_list} %>
+</div>
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
new file mode 100644
index 000000000..3e9713bdd
--- /dev/null
+++ b/app/views/bids/_homework_list.html.erb
@@ -0,0 +1,30 @@
+<!-- fq -->
+<%= render_flash_messages %>
+
+<% @homework_list.each do |homework|%>
+		<% if homework.attachments.any?%>
+		
+		<table width="660px" border="0" align="center">
+	<tr>
+		<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(homework.user), :class => "avatar"), user_path(homework.user), :class => "avatar" %></td>
+		<td>
+		<table width="580px" border="0">
+			<tr>
+				<td colspan="2" valign="top"><strong> <%= link_to homework.user, user_path(homework.user)%></strong>  <span class="font_lighter">提交了作业</span></td>
+			</tr>
+			<tr>
+				<td colspan="2" width="580px" >
+				<p class="font_description">
+					<% options = {:author => true, :deletable => attach_delete(homework)} %>
+		<%= render :partial => 'attachments/links',
+        :locals => {:attachments => homework.attachments, :options => options} %>
+		<% end %>
+				</p></td>
+			</tr>
+		</table></td>
+	</tr>
+</table>
+<div class="line_under"></div>
+		
+		
+<% end %>
diff --git a/app/views/bids/_new.html.erb b/app/views/bids/_new.html.erb
index ad48a979f..d57a26d72 100644
--- a/app/views/bids/_new.html.erb
+++ b/app/views/bids/_new.html.erb
@@ -65,14 +65,18 @@
 <% if User.current.logged? %>
 <table border="0" width="525px" align="center" >
 	<tr>
-		<td><%= f.text_area 'message', :rows => 3, :cols => 65, :value => "#{l(:label_my_respond)}", :onfocus => "clearInfo('bid_message_message', '#{l(:label_my_respond)}')", :onblur => "showInfo('bid_message_message', '#{l(:label_my_respond)}')", :style => "resize: none;", :class => 'noline'%></td>
+		<% if @bid.reward_type ==3 %>
+		<td><%= f.text_area 'message', :rows => 3, :cols => 65, :placeholder => l(:label_my_question), :style => "resize: none;", :class => 'noline'%></td>
+	    <% else %>
+	    <td><%= f.text_area 'message', :rows => 3, :cols => 65, :placeholder => l(:label_my_respond), :style => "resize: none;", :class => 'noline'%></td>
+	    <% end %>
 	</tr>
 </table>
 <%= f.text_field :reference_user_id, :style=>"display:none"%>
 <table border="0" width="525px" align="center">
 	<tr>
 		<td align="right"> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%>
-		<%= submit_tag l(:button_clear), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
+		<%= submit_tag l(:button_clear_requirement), :name => nil, :onclick => "clearMessage('bid_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
 	</tr>
 </table>
 <% else %>
diff --git a/app/views/bids/_project_homework.html.erb b/app/views/bids/_project_homework.html.erb
new file mode 100644
index 000000000..bfe86c75c
--- /dev/null
+++ b/app/views/bids/_project_homework.html.erb
@@ -0,0 +1,51 @@
+<!-- fq -->
+<%= render_flash_messages %>
+<table width="1000px" border="0" style="padding-left: 15px">
+	<td class="font_lighter" style="font-size: 15px;"><%= l(:label_bidding_project) %>(<%= @bidding_project.count%>)</td>
+	<% if User.current.logged? %>
+	<td>
+	<div class='icon icon-add'>
+		<%= toggle_link l(:button_bidding), 'put-bid-form' %>
+	</div></td>
+	<% end %>
+</table>
+
+<% @bidding_project.each do |b_project|%>
+<table width="90%" border="0" align='center'>
+	<tr>
+		<td>
+		<table width="660px" border="0" align='center'>
+			<tr>
+				<td width="50px" valign="top" colspan="2" align="middle">
+				<div style="width: 50px; height: 50px;">
+					<%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %>
+				</div></td>
+				<td width="60%" valign="top">
+				<table width="100%" valign="top">
+					<tr>
+						<td colspan="2" valign="top"><strong><%= link_to(b_project.project.name, project_path(b_project.project)) %></strong><a class="font_lighter"><%= l(:label_join_bidding)%></a></td>
+					</tr>
+					<tr></tr>
+					<tr>
+						<td valign="top"><%= b_project.project.description %></td>
+					</tr>
+					<tr>
+						<td valign="top"><a class="font_lighter"><%= b_project.created_at%></a></td>
+					</tr>
+				</table></td>
+				<td width="30%">
+				<div class="bid-user-message" style="border-left:  1px solid rgb(225, 225, 225); margin-left: 20px; padding-left: 20px;">
+					<table width="100%">
+						<tr>
+							<td><%= l(:label_bidding_user) %><%= link_to(b_project.user.name, user_path(b_project.user)) %></td>
+						</tr>
+						<tr>
+							<td style=" word-wrap: break-word; word-break: break-all"><%= l(:label_bidding_reason) %><%= b_project.description %></td>
+						</tr>
+					</table>
+				</div></td>
+			</tr>
+		</table></td>
+	</tr>
+</table>
+<% end %>
diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb
index bfe86c75c..bb75bbf6b 100644
--- a/app/views/bids/_project_list.html.erb
+++ b/app/views/bids/_project_list.html.erb
@@ -1,5 +1,62 @@
 <!-- fq -->
 <%= render_flash_messages %>
+<% if @bid.reward_type == 3 %>
+<table width="1000px" border="0" style="padding-left: 15px">
+	<td class="font_lighter" style="font-size: 15px;"><%= l(:label_homework_project) %>(<%= @bidding_project.count%>)</td>
+	<% if User.current.logged? %>
+	<td>
+	<% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %>
+	<div class='icon icon-add'>
+		<%= toggle_link l(:button_bidding_homework), 'put-bid-form' %>
+	</div>	
+	<% end %>
+	</td>
+	<% end %>
+</table>
+
+<% @bidding_project.each do |b_project|%>
+<table width="90%" border="0" align='center'>
+	<tr>
+		<td>
+		<table width="660px" border="0" align='center'>
+			<tr>
+				<td width="50px" valign="top" colspan="2" align="middle">
+				<div style="width: 50px; height: 50px;">
+					<%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %>
+				</div></td>
+				<td width="60%" valign="top">
+				<table width="100%" valign="top">
+					<tr>
+						<td colspan="2" valign="top"><strong><%= link_to(b_project.project.name, project_path(b_project.project)) %></strong><a class="font_lighter"><%= l(:label_jion_bidding_homework)%></a></td>
+					</tr>
+					<tr></tr>
+					<tr>
+						<td valign="top"><%= b_project.project.description %></td>
+					</tr>
+					<tr>
+						<td valign="top"><a class="font_lighter"><%=format_time(b_project.created_at) %></a></td>
+					</tr>
+				</table></td>
+				<td width="30%">
+				<div class="bid-user-message" style="border-left:  1px solid rgb(225, 225, 225); margin-left: 20px; padding-left: 20px;">
+					<table width="100%">
+						<tr>
+							<td><%= l(:label_bidding_user_homework) %> : <%= link_to(b_project.user.name, user_path(b_project.user)) %></td>
+						</tr>
+						<tr>
+							<td style=" word-wrap: break-word; word-break: break-all"><%= l(:label_bidding_reason_homewrok) %> : <%= b_project.description %></td>
+						</tr>
+					</table>
+				</div></td>
+			</tr>
+		</table></td>
+	</tr>
+</table>
+<% end %>
+
+
+
+	<% else %>
 <table width="1000px" border="0" style="padding-left: 15px">
 	<td class="font_lighter" style="font-size: 15px;"><%= l(:label_bidding_project) %>(<%= @bidding_project.count%>)</td>
 	<% if User.current.logged? %>
@@ -49,3 +106,4 @@
 	</tr>
 </table>
 <% end %>
+<% end %>
diff --git a/app/views/bids/add_homework.js.erb b/app/views/bids/add_homework.js.erb
new file mode 100644
index 000000000..f553f6695
--- /dev/null
+++ b/app/views/bids/add_homework.js.erb
@@ -0,0 +1,4 @@
+$('#bidding_project_list').html('<%= escape_javascript(render(:partial => 'homework_list', :locals => {:homework => @homework_list})) %>');
+$("#project_id").val("请选择项目");
+$("#bid_message").val("#{l(:label_bid_reason)} ");
+$("#put-bid-form").hide();
\ No newline at end of file
diff --git a/app/views/bids/homework_respond.html.erb b/app/views/bids/homework_respond.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/bids/homework_statistics.html.erb b/app/views/bids/homework_statistics.html.erb
new file mode 100644
index 000000000..9f98364cc
--- /dev/null
+++ b/app/views/bids/homework_statistics.html.erb
@@ -0,0 +1,4 @@
+未交作业人数（
+<% %>）
+
+已交作业人数
\ No newline at end of file
diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb
index d3b526982..31cb60830 100644
--- a/app/views/bids/show.html.erb
+++ b/app/views/bids/show.html.erb
@@ -4,7 +4,23 @@
     <td width="50" valign="top"><%= link_to image_tag(url_to_avatar(@bid.author), :class => "avatar"), user_path(@bid.author), :class => "avatar" %></td>
     <td><table width="100%" border="0">
       <tr>
-        <td><h3><%= link_to(@bid.author.name, user_path(@bid.author))%>：<%= @bid.name %></h3></td>
+        <td><h3><%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：<%= @bid.name %></h3></td>
+        <td>
+        	<!-- 在这里添加赞和踩-->
+	      <span id="praise_tread" style="float: right"> 
+		<%= render :partial => "/praise_tread/praise_tread",
+		:locals => {:obj => @bid,:show_flag => true,:user_id =>User.current.id}%>
+		 </span>
+        	
+        </td>
+        <td>
+        	<!-- 在这里添加赞和踩-->
+	      <span id="praise_tread" style="float: right"> 
+		<%= render :partial => "/praise_tread/praise_tread",
+		:locals => {:obj => @bid,:show_flag => true,:user_id =>User.current.id}%>
+		 </span>
+        	
+        </td>
         <td>
         	<!-- 在这里添加赞和踩-->
 	      <span id="praise_tread" style="float: right"> 
@@ -20,7 +36,6 @@
 				<% elsif @bid.reward_type == 2%>
 				<td><strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= @bid.budget%></span></strong></td>
 				<% else %>
-				<td><strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %>&nbsp;<%= @bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong></td>
 				<% end %>
       </tr>
     </table></td>
@@ -31,7 +46,13 @@
 	<tr>
 		<td></td>
 		</tr>
-	<tr><td style="font-size: 13px; color: rgb(0,0,0);"><%= @bid.description %></td></tr>
+	<tr><td style="font-size: 13px; color: rgb(0,0,0);"><%= @bid.description %>
+		<% if @bid.attachments.any?%>
+		<% options = {:author => true} %>
+		<%= render :partial => 'attachments/links',
+        :locals => {:attachments => @bid.attachments, :options => options} %>
+		<% end %>
+	</td></tr>
 </table>
 </div>
 
@@ -44,7 +65,7 @@
 <div class="pagination" style="float:left;">
 	<ul>
 		<%= pagination_links_full @feedback_pages %>
-		<ul>
+	<ul>
 </div>
 
 <!-- end -->
diff --git a/app/views/bids/show_document_homework.html.erb b/app/views/bids/show_document_homework.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/bids/show_project.html.erb b/app/views/bids/show_project.html.erb
index ba0b99283..855ec30f4 100644
--- a/app/views/bids/show_project.html.erb
+++ b/app/views/bids/show_project.html.erb
@@ -1,4 +1,9 @@
 <!-- fq -->
+
+<% if @bid.homework_type == 1%>
+<%= render :partial => 'homework' %>
+ 
+<% else %>
 <style>
 	input[type="submit"].bid_btn {
 		vertical-align: middle;
@@ -66,11 +71,15 @@
 		<tr>
 			<td><%= select_tag 'bid', options_for_select(@option), :name => 'bid', :class => 'grayline' %></td>
 		</tr>
+		<% if @bid.reward_type == 3 %>
+		<tr>
+			<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason_homework), :style => "resize: none;", :class => 'noline'%></td>
+		</tr>
+		<% else %>
 		<tr>
-			<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40,
-      :onfocus => "clearInfo('bid_message','#{l(:label_bid_reason)}')", :onblur => "showInfo('bid_message','#{l(:label_bid_reason)}')",
-      :value => "#{l(:label_bid_reason)}", :style => "resize: none;", :class => 'noline'%></td>
+			<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason), :style => "resize: none;", :class => 'noline'%></td>
 		</tr>
+		<% end %>			
 		<tr>
 			<td align="right"><%= submit_tag l(:button_add), :name => nil , :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -30px'"%>
 			<%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'",
@@ -84,3 +93,5 @@
 <div id='bidding_project_list'>
 	<%= render :partial => 'project_list', :locals => {:bidding_project => @bidding_project} %>
 </div>
+<% end %>
+
diff --git a/app/views/bids/show_project_homework.html.erb b/app/views/bids/show_project_homework.html.erb
new file mode 100644
index 000000000..ba0b99283
--- /dev/null
+++ b/app/views/bids/show_project_homework.html.erb
@@ -0,0 +1,86 @@
+<!-- fq -->
+<style>
+	input[type="submit"].bid_btn {
+		vertical-align: middle;
+		width: 60px;
+		height: 30px;
+		line-height: 18px;
+		font-size: 14px;
+		color: rgb(0, 0, 0);
+		background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
+		padding: 0px 0px 4px 0px;
+		border-radius: 2px;
+		border: 1px solid rgb(148, 148, 148);
+		box-shadow: none;
+		text-shadow: none;
+		margin-top: -10px;
+		/*margin-right: -4px;*/
+	}
+	input[type="button"].bid_btn {
+		width: 60px;
+		height: 30px;
+		line-height: 18px;
+		font-size: 14px;
+		color: rgb(0, 0, 0);
+		background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
+		padding: 0px 0px 4px 0px;
+		border-radius: 2px;
+		border: 1px solid rgb(148, 148, 148);
+		box-shadow: none;
+		text-shadow: none;
+		margin-top: -10px;
+		margin-right: -2px;
+	}
+	textarea:focus {
+		border: #d5dee9 1px solid;
+	}
+</style>
+
+<script type="text/javascript" language="javascript">
+	function clearInfo(id,content) {
+		var text = $('#' + id);
+		if (text.val() == content) {
+			$('#' + id).val('');
+		}
+	}
+
+	function showInfo(id,content) {
+		var text = $('#' + id);
+		if (text.val() == '') {
+			$('#' + id).val(content);
+		}
+	}
+
+	function cancel() {
+		$("#put-bid-form").hide();
+	}
+</script>
+
+<% if User.current.logged? %>
+<div id = 'flash' style="float:left; width: 100%; display: none" ></div>
+<div id="put-bid-form" style="display: none">
+	<%= form_for "bid_for_save", :remote=>true, :url => {:controller => 'bids', :action => 'add'},
+	:update => "bidding_project_list",
+	:complete => '$("#put-bid-form").hide();' do |f| %>
+	<table id="bidding_table" border="0" width="400" style="margin-left: 40px;">
+		<tr>
+			<td><%= select_tag 'bid', options_for_select(@option), :name => 'bid', :class => 'grayline' %></td>
+		</tr>
+		<tr>
+			<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40,
+      :onfocus => "clearInfo('bid_message','#{l(:label_bid_reason)}')", :onblur => "showInfo('bid_message','#{l(:label_bid_reason)}')",
+      :value => "#{l(:label_bid_reason)}", :style => "resize: none;", :class => 'noline'%></td>
+		</tr>
+		<tr>
+			<td align="right"><%= submit_tag l(:button_add), :name => nil , :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -30px'"%>
+			<%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'",
+			:onmouseover => "this.style.backgroundPosition = 'left -30px'" %> </td>
+		</tr>
+	</table>
+	<% end %>
+</div>
+<% end %>
+
+<div id='bidding_project_list'>
+	<%= render :partial => 'project_list', :locals => {:bidding_project => @bidding_project} %>
+</div>
diff --git a/app/views/courses/_set_join.js.erb b/app/views/courses/_set_join.js.erb
new file mode 100644
index 000000000..50bb692d4
--- /dev/null
+++ b/app/views/courses/_set_join.js.erb
@@ -0,0 +1,8 @@
+$('#join').html('<%= escape_javascript join_in_course(course, user) %>');
+<% if @state %>
+	<% if @state == 0 %>
+	alert("加入成功")
+	<% else %>
+	alert("密码错误")
+	<% end %>
+<% end %>
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index 001ae9596..bf42c5dbd 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -1,6 +1,14 @@
-<div class="contextual" style="padding-right: 440px;padding-top: 5px;">
-<%= link_to(l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %>
+<% if @project.project_type == 1 %>
+<div class="contextual" style="padding-right: 540px;padding-top: 5px;">
+	<% if User.current.member_of?(@project) %>
+<%= link_to(l(:label_file_upload), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %>
+	<% end %>
 </div>
+<% else %>
+<div class="contextual" style="padding-right: 540px;padding-top: 5px;">
+<%= link_to(l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %>
+</div>	
+<% end %>
 
 <h3><%=l(:label_attachment_plural)%></h3>
 
@@ -11,8 +19,8 @@
     <%= sort_header_tag('filename', :caption => l(:field_filename)) %>
     <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %>
     <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc') %>
-    <%= sort_header_tag('downloads', :caption => l(:label_downloads_abbr), :default_order => 'desc') %>
-    <th>MD5</th>
+    <!-- <%= sort_header_tag('downloads', :caption => l(:label_downloads_abbr), :default_order => 'desc') %> -->
+    <th> <%= sort_header_tag('description', :caption => l(:field_description)) %></th>
     <th></th>
   </tr></thead>
   <tbody>
@@ -30,8 +38,8 @@
     <td class="filename"><%= link_to_attachment file, :download => true, :title => file.description %></td>
     <td class="created_on"><%= format_time(file.created_on) %></td>
     <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
-    <td class="downloads"><%= file.downloads %></td>
-    <td class="digest"><%= file.digest %></td>
+    <!-- <td class="downloads"><%= file.downloads %></td> -->
+    <td class="digest" width="300px"><%= file.description %></td>
     <td align="center">
     <%= link_to(image_tag('delete.png'), attachment_path(file),
                                          :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
@@ -44,3 +52,4 @@
 </table>
 
 <% html_title(l(:label_attachment_plural)) -%>
+
diff --git a/app/helpers/issue_categories_helper.rb b/app/views/issue_categories/issue_categories_helper.rb
similarity index 100%
rename from app/helpers/issue_categories_helper.rb
rename to app/views/issue_categories/issue_categories_helper.rb
diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb
index eff2cd6f7..36be8c5f0 100644
--- a/app/views/layouts/base_bids.html.erb
+++ b/app/views/layouts/base_bids.html.erb
@@ -64,7 +64,7 @@
 										<div>
 										  <%= link_to l(:label_x_followers, :count => @bid.watcher_users.count)+"("+@bid.watcher_users.count.to_s+")", respond_path(@bid) %> &nbsp;
 										  <%= link_to l(:label_bidding_project)+"("+@bid.biding_projects.count.to_s+")", project_for_bid_path(@bid) %>&nbsp;
-										  <%= link_to l(:label_x_responses, :count => @bid.commit)+"("+@bid.commit.to_s+")", respond_path(@bid)%>
+										  <%= link_to l(:label_x_bids_responses, :count => @bid.commit)+"("+@bid.commit.to_s+")", respond_path(@bid)%>
 										</div>
 									</div>
 									<div class="user_fans">
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
new file mode 100644
index 000000000..475bcb89b
--- /dev/null
+++ b/app/views/layouts/base_courses.html.erb
@@ -0,0 +1,174 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title><%= h html_title %></title>
+		<meta name="description" content="<%= Redmine::Info.app_name %>" />
+		<meta name="keywords" content="issue,bug,tracker" />
+		<%= csrf_meta_tag %>
+		<%= favicon %>
+		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
+		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+		<%= javascript_heads %>
+		<%= heads_for_theme %>
+		<%= call_hook :view_layouts_base_html_head %>
+		<!-- page specific tags -->
+		<%= yield :header_tags -%>
+	</head>
+	<!--add by huang-->
+	<body class="<%= h body_css_classes %>">
+		<div id="wrapper">
+			<div id="wrapper2">
+				<div id="wrapper3">
+					<%= render :partial => 'layouts/base_header'%>
+
+					<div id="main">
+						<!--project page-->
+						<div id="sidebar">
+							<div class="spaceleft">
+								<!--informations-->
+								<div class="inf_user_image">
+									<% @project = Project.find_by_id(@project.id)%>
+									<% @course = Course.find_by_extra(@project.identifier)%>
+									<table>
+										<tr>
+											<td><%= link_to image_tag(url_to_avatar(@project), :class => 'avatar2') %></td>
+											<td align="center">
+											<div class="info_font" style=" word-wrap: break-word; word-break: break-all">
+												<%=  @project.name %>												
+											</div>
+											<%= join_in_course(@project, User.current)%>
+											</td>
+										</tr>
+									</table>												
+								</div>
+
+								<!--parameter-->
+								<div class="user_fans">
+									
+									<table width="240" border="0">
+										<tr align="center" width="80px">
+											<% files_count = @project.attachments.count %>
+											<% @project.versions.each do |version| %>
+											<% files_count += version.attachments.count %>
+											<% end %>
+
+											<td class="font_index"><%=link_to "#{@project.members.count}", project_member_path(@project) ,:course =>'1'%></td>
+											
+											<td class="font_index"><%=link_to files_count, project_files_path(@project) %></td>
+										<tr class="font_aram">
+											<td align="center" width="80px"> <%= "成员" %></td> 
+											
+											<td align="center" width="80px"><%= l(:label_course_data) %></td>
+										</tr>
+									</table>
+									<div class="user_underline"></div>
+								</div>
+							<!--info-->
+													
+							<div class="inf_user_context">
+										<table style="font-family:微软雅黑" >
+											<!-- <tr>
+												<td valign="top" style="padding-left: 8px;">课程口令：</td><td class="font_lighter_sidebar"><%= @course.state%></td>
+											</tr> -->
+											                                      
+											<tr>
+												<td valign="top" style="padding-left: 8px;">主讲老师：</td><td class="font_lighter_sidebar"><%= @course.teacher.lastname+@course.teacher.firstname %></td>
+											</tr>
+											<tr>
+												<td valign="top" style="padding-left: 8px;">课程学期：</td><td class="font_lighter_sidebar"><%= @course.term %></td>
+											</tr>											
+											<tr>
+												<td valign="top" style="padding-left: 8px;">教师单位：</td><td class="font_lighter_sidebar"><%= @course.teacher.user_extensions.occupation %></td>
+											</tr> 												
+																			
+										</table>
+
+									</div>
+									<div class="user_underline"></div>
+								<!--description-->
+								<div class="inf_user_context">
+									<div class="font_title_left">
+										<%= l(:label_project_overview) %>
+									</div>
+									
+									<div style="padding-bottom: 8px">
+										<% if @project.description.size>0 %>
+										<div class="font_lighter_sidebar">
+											
+											<%= textilizable @project.description %>
+										</div>
+										<% else %>
+										<div class="font_lighter_sidebar">
+										<%= l(:label_course_description_no) %>
+										</div>
+										<% end %>
+										<div class="created_on_project">
+											<strong style="color: #068d9c"><%= l(:label_create_time) %>：</strong><%= format_time(@project.created_on) %>
+										</div>
+									</div>
+									<div class="user_underline"></div>
+								</div>
+															<!--tags-->																
+									
+									<div class="user_fans">
+										<!-- added by william -for tag -->
+										<div class="user_tags">
+										<div id="tags">
+											<%= render :partial => 'tags/tag', :locals => {:obj => @project,:object_flag => "2"}%>
+										</div></div>
+									</div>
+
+
+								<!--tool-->
+								<!-- <div class="user_underline"></div> -->
+								<!-- <div class="tool">
+									<div class="font_title_left">
+										<%= l(:label_project_tool)%>
+									</div>
+									
+									<table class="font_tool">
+										<tr>
+											<td align="left" width="60px" valign="center"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> 
+												<%= link_to l(:project_module_documents),project_documents_path(@project) %></td>
+										</tr>
+										<tr>
+											<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> 
+												<%= link_to l(:project_module_boards) ,project_boards_path(@project) %>
+											</td>
+										</tr>
+									</table>
+								</div> -->
+								<div class="user_underline"></div>
+							</div>
+						</div>
+						<div id="content">							
+							<div class="tabs_new">
+								<ul>
+									<li><%= link_to l(:label_course_overview), project_path(@project), :class => link_class(:overview)%></li>									
+									<li><%= link_to l(:label_homework), {:controller => 'projects', :action => 'homework'}, :class => link_class('Homework')%></li>
+									<li><%= link_to l(:label_course_file), project_files_path(@project), :class => link_class(:files)%></li>
+									<li><%= link_to l(:label_course_news), {:controller => 'news', :action => 'index', :project_id => @project}, :class => link_class(:news)%></li>
+					                <!-- <li><%= link_to(l(:label_course_repository), {:controller => 'repositories', :action => 'show', :id => @project, :repository_id => nil, :path => nil, :rev => nil, :course => 1 })%></li> -->
+								    <% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 3, 7)).size >0))%>
+								    <li><%= link_to l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project}, :class => link_class(:settings)%></li></ul>
+									<% end %>
+							</div>
+							<%= yield %>
+							<%= call_hook :view_layouts_base_content %>
+							<div style="clear:both;"></div>
+							<%= render_flash_messages %>
+
+						</div>
+						<%= render :partial => 'layouts/base_footer'%>
+					</div>
+
+					<div id="ajax-indicator" style="display:none;">
+						<span><%= l(:label_loading) %></span>
+					</div>
+					<div id="ajax-modal" style="display:none;"></div>
+				</div>
+			</div>
+			<%= call_hook :view_layouts_base_body_bottom %>
+	</body>
+</html>
\ No newline at end of file
diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb
new file mode 100644
index 000000000..a20f4e6f4
--- /dev/null
+++ b/app/views/layouts/base_homework.html.erb
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title><%= h html_title %></title>
+		<meta name="description" content="<%= Redmine::Info.app_name %>" />
+		<meta name="keywords" content="issue,bug,tracker" />
+		<%= csrf_meta_tag %>
+		<%= favicon %>
+		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
+		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+		<%= javascript_heads %>
+		<%= heads_for_theme %>
+		<%= call_hook :view_layouts_base_html_head %>
+		<!-- page specific tags -->
+		<%= yield :header_tags -%>
+	</head>
+	<body class="<%= h body_css_classes %>">
+		<div id="wrapper">
+			<div id="wrapper2">
+				<div id="wrapper3">
+
+					<%= render :partial => 'layouts/base_header'%>
+
+					<div id="main" class="">
+						<div id="sidebar">
+							<div class="main_context">
+								<div class="spaceleft">
+									<div>
+										<table  style="padding-top: 20px ;width: 232px ; height: 80px;">
+											<tr>
+												<td class="info_font" align="center" style=" word-wrap: break-word; word-break: break-all; color: #ed8924 "><%= h @bid.name %></td>
+											</tr>
+											<tr>
+												<td align="center"> <%= watcher_link(@bid, User.current) %> </td>
+											</tr>
+										</table>
+										</div>
+										<div class="user_underline"></div>
+
+										<!-- info -->
+										<div class="inf_user_image">
+										<table>
+											<tr>
+												<td style="text-align: justify ; text-justify: inter-ideograph; width: 180px"><%= l(:label_teacher_homework) %> : <%= link_to(@user.lastname+@user.firstname, user_path(@user)) %></td>
+											</tr>
+											<tr>
+												<td><%= l(:label_course_homework) %> : <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %></td>
+											</tr>
+											<tr>
+												<td><%= l(:label_limit_time) %>： <%= @bid.deadline %></td>
+											</tr>											
+										</table>
+									</div>
+
+									<!-- tags -->
+									<div class="user_fans">
+										<div class="user_underline"></div>
+										<table style="font-family:微软雅黑; padding-left: 8px">
+											<tr>
+												<td><!-- added by william -for tag --> <%= render :partial => 'tags/tag', :locals => {:obj => @bid, :object_flag => "4"}%> </td>
+											</tr>
+										</table>
+
+									</div>
+
+									<!--homework-->
+									<div class="user_fans">
+										<div class="font_title_left">
+											<strong><%= l(:label_commit_homework) %></strong>
+										</div>
+										<div class="user_underline"></div>
+										<div class="left_wf">
+											<table>
+												<tr>
+													<td style="padding-top: 5px"> <% if @bid.homework_type == 1%>
+													<% if @bid.homeworks.size>0 %>
+													<% for homework in @bid.homeworks %>
+													<%= link_to image_tag(url_to_avatar(homework.user), :class => "avatar", :title => homework.user.name), user_path(homework.user), :class => "avatar" %>
+													<% end %>
+													<% else %>
+													<p class="font_lighter">
+														<%= l(:label_no_course_project) %>
+													</p> <% end %>
+													<% else %>
+													<% if @bid.projects.size>0 %>
+													<% for project in @bid.projects%>
+													<%= link_to image_tag(url_to_avatar(project), :class => "avatar", :title => project.name), project_path(project), :class => "avatar" %>
+													<% end %>
+													<% else %>
+													<p class="font_lighter">
+														<%= l(:label_no_course_project) %>
+													</p> <% end %>
+													<% end %> </td>
+												</tr>
+											</table>
+										</div>
+									</div>
+									<div class="user_underline"></div>
+
+								</div>
+
+							</div>
+							<!-- end -->
+						</div>
+						<div id="content">
+
+							<div class="tabs_new">
+								<ul>
+									<li>
+										<%= link_to l(:label_question_student), {:controller => 'bids', :action => 'show' },:class => link_class(:respond)%>
+									</li>
+									<li>
+										<% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %>
+										<%= link_to l(:label_homework_commit), {:controller => 'bids', :action => 'show_project' },:class => link_class(:project)%>
+										<% else %>
+										<%= link_to l(:label_homework_info), {:controller => 'bids', :action => 'show_project' },:class => link_class(:project)%>
+									
+										<% end %>
+									</li>
+									<!-- <li><%= link_to l(:label_homework_statistics), { :controller => 'bids', :action => 'homework_statistics' },:class => link_class(:homework_statistics)%></li> -->
+									<!-- <li><%= link_to l(:label_homework_respond), { :controller => 'bids', :action => 'homework_respond' },:class => link_class(:homework_respond)%></li>
+									--><ul>
+							</div>
+
+							<%= yield %>
+							<%= call_hook :view_layouts_base_content %>
+							<div style="clear:both;"></div>
+						</div>
+						<%= render :partial => 'layouts/base_footer'%>
+					</div>
+				</div>
+			</div>
+
+			<div id="ajax-indicator" style="display:none;">
+				<span><%= l(:label_loading) %></span>
+			</div>
+			<div id="ajax-modal" style="display:none;"></div>
+
+		</div>
+		<%= call_hook :view_layouts_base_body_bottom %>
+	</body>
+</html>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 2cedd1815..7faf4b4e6 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -96,10 +96,10 @@
 									<div class="inf_user_context">
 										<table style="font-family:微软雅黑" width="240">
 											<tr>
-												<td style="padding-left: 8px" width="70px"><%= l(:label_user_joinin) %></td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= format_date(@user.created_on) %></td>
+												<td style="padding-left: 8px" width="70px"><%= l(:label_user_joinin) %></td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= format_time(@user.created_on) %></td>
 											</tr>
 											<tr>
-												<td style="padding-left: 8px"><%= l(:label_user_login) %></td><td class="font_lighter_sidebar" style="padding-left: 0px"><%= format_date(@user.last_login_on) %></td>
+												<td style="padding-left: 8px"><%= l(:label_user_login) %></td><td class="font_lighter_sidebar" style="padding-left: 0px"><%= format_time(@user.last_login_on) %></td>
 											</tr>
 											<tr>
 												<td valign="top" style="padding-left: 8px;"><%= l(:label_user_mail) %></td><td class="font_lighter_sidebar"  style="padding-left: 0px; word-wrap: break-word; word-break: break-all"><%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></td>
diff --git a/app/views/mailer/journals_for_message_added.html.erb b/app/views/mailer/journals_for_message_added.html.erb
new file mode 100644
index 000000000..f68026492
--- /dev/null
+++ b/app/views/mailer/journals_for_message_added.html.erb
@@ -0,0 +1,2 @@
+<h1><%= link_to("hello", @url) %></h1>
+<em><%=h @user %></em>
diff --git a/app/views/news/_form.html.erb b/app/views/news/_form.html.erb
index b4f55ebe8..df80a7483 100644
--- a/app/views/news/_form.html.erb
+++ b/app/views/news/_form.html.erb
@@ -2,7 +2,7 @@
 
 <div class="box tabular">
 <p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
-<p style="margin-left:-10px;"><%= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p>
+<!-- <p style="margin-left:-10px;"><%= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
 <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 15, :class => 'wiki-edit', :style => "width:490px;" %></p>
 <p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p>
 </div>
diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index 64d633575..cded25576 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -1,12 +1,24 @@
 <div style="padding-bottom: 10px">
-<%= link_to(l(:label_news_new),
+	<% if @project.project_type == 1%>
+<%= link_to(l(:label_news_notice),
             new_project_news_path(@project),
             :class => 'icon icon-add',
             :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
+    <% else %>
+    <%= link_to(l(:label_news_new),
+            new_project_news_path(@project),
+            :class => 'icon icon-add',
+            :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
+    
+    <% end %>
 </div>
 
 <div id="add-news" style="display:none;">
+<% if @project.project_type == 1 %>
+<h3><%=l(:bale_news_notice)%></h3>
+<% else %>
 <h3><%=l(:label_news_new)%></h3>
+<% end %>
 <%= labelled_form_for @news, :url => project_news_index_path(@project),
                                            :html => { :id => 'news-form', :multipart => true } do |f| %>
 <%= render :partial => 'news/form', :locals => { :f => f } %>
@@ -39,13 +51,19 @@
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% else %>
 <% @newss.each do |news| %>
-<table width="660px" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;">
+<table width="660px" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
   <tr>
     <td colspan="2" valign="top" width="50" ><%=link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %></td>
     <td><table width="580px" border="0">
+    	<% if @project.project_type == 1 %>
       <tr>
+        <td colspan="2" valign="top"><strong><%=link_to_user(news.author)if news.respond_to?(:author) %></strong> <span class="font_lighter"><%= l(:label_project_notice)%></span> <%= link_to h(news.title), news_path(news) %></td>
+      </tr>
+        <% else %>
+        <tr>
         <td colspan="2" valign="top"><strong><%=link_to_user(news.author)if news.respond_to?(:author) %></strong> <span class="font_lighter"><%= l(:label_project_newshare)%></span> <%= link_to h(news.title), news_path(news) %></td>
-        </tr>
+      </tr>
+        <% end %>
       <tr>
         <td colspan="2" width="580px" ><span class="font_description"><%= textilizable(news, :description) %></span></td>
         </tr>
diff --git a/app/views/projects/_course_form.html.erb b/app/views/projects/_course_form.html.erb
new file mode 100644
index 000000000..efc537113
--- /dev/null
+++ b/app/views/projects/_course_form.html.erb
@@ -0,0 +1,58 @@
+<%= error_messages_for 'project' %>
+<%= error_messages_for 'course' %>
+
+<!--[form:project]-->
+<% unless @project.new_record? %>
+<p><%= render :partial=>"avatar/avatar_form",:locals=> {source:@project} %></p>
+<% end %>
+<p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %></p>
+
+<p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %></p><!--by young-->
+<!-- <p><%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH %>
+<% unless @project.identifier_frozen? %>
+  <em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
+<% end %></p> -->
+
+
+ <%= f.fields_for @course do |m| %>
+
+<!-- added by huang	 -->
+	 <p style="margin-left:-10px;"><%= m.text_field :state, :required => true, :size => 60, :style => "width:488px;margin-left: 10px;" %></p>
+	 <em class="info" style="margin-left:95px;"><%= l(:text_command) %></em>
+	 <p style="margin-left:-10px;"><%= m.text_field :term, :required => true, :size => 60, :style => "width:488px;margin-left: 10px;" %></p>		
+	 <!-- <p style="margin-left:-28px;"><em class="info"><%= l(:label_term) %> <%= select_tag 'term', "<option value = '0'>#{l(:label_spring)}</option><option value = '1'>#{l(:label_summer)}</option><option value = '2'>#{l(:label_autumn)}</option>".html_safe %></em></p> -->
+<% end %>
+<!-- <p style="margin-left:-10px;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></p> -->
+<p style="display:none;"><%= f.text_field :project_type, :value => 1 %></p>
+
+
+<%= wikitoolbar_for 'project_description' %>
+
+<% @project.custom_field_values.each do |value| %>
+  <p><%= custom_field_tag_with_label :project, value %></p>
+<% end %>
+<%= call_hook(:view_projects_form, :project => @project, :form => f) %>
+
+
+
+<!--[eoform:project]-->
+
+<% unless @project.identifier_frozen? %>
+  <% content_for :header_tags do %>
+    <%= javascript_include_tag 'project_identifier' %>
+  <% end %>
+<% end %>
+
+<% if !User.current.admin? && @project.inherit_members? && @project.parent && User.current.member_of?(@project.parent) %>
+  <%= javascript_tag do %>
+    $(document).ready(function() {
+      $("#project_inherit_members").change(function(){
+        if (!$(this).is(':checked')) {
+          if (!confirm("<%= escape_javascript(l(:text_own_membership_delete_confirmation)) %>")) {
+            $("#project_inherit_members").attr("checked", true);
+          }
+        }
+      });
+    });
+  <% end %>
+<% end %>
diff --git a/app/views/projects/_edit.html.erb b/app/views/projects/_edit.html.erb
index 8661b6874..1ec8b1ee8 100644
--- a/app/views/projects/_edit.html.erb
+++ b/app/views/projects/_edit.html.erb
@@ -1,6 +1,10 @@
 <div class="box tabular" style="margin-right:10px;" >
 <%= labelled_form_for @project do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save) %>
+        <% if @project.project_type == 1%>
+        <%= render :partial => 'course_form', :locals => { :f => f } %>
+        <% else %>
+		<%= render :partial => 'form', :locals => { :f => f } %>
+		<% end %>
+		<%= submit_tag l(:button_save) %>
 <% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index 8d9ee0dfc..2ccd84032 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -10,9 +10,9 @@
 <% unless @project.identifier_frozen? %>
   <em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
 <% end %></p>
-<p style="margin-left:-10px;"><%= f.text_field :homepage, :size => 60, :style => "width:488px;margin-left: 10px;" %></p>
-<p style="margin-left:-10px;"><%= f.check_box :is_public, :style => "margin-left:10px;" %></p>
-
+<!-- <p style="margin-left:-10px;"><%= f.text_field :homepage, :size => 60, :style => "width:488px;margin-left: 10px;" %></p> -->  <!-- by huang -->
+<p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :is_public, :style => "margin-left:10px;" %><%= l(:label_public_info) %></em></p>
+<p style="display:none;"><%= f.text_field :project_type, :value => 0 %></p>
 
 <%= wikitoolbar_for 'project_description' %>
 
diff --git a/app/views/projects/_homework_form.html.erb b/app/views/projects/_homework_form.html.erb
new file mode 100644
index 000000000..e4a471367
--- /dev/null
+++ b/app/views/projects/_homework_form.html.erb
@@ -0,0 +1,41 @@
+<!-- fq -->
+
+<script type="text/javascript" language="javascript">
+	function show(id, id_t, label_reward, label_money, label_credit, label_content) {
+		var text = $('#' + id);
+		var text_t = $('#' + id_t);
+		if (text.val() == 0) {
+			text_t.attr("placeholder", label_reward);
+		}
+		if (text.val() == 1) {
+			text_t.attr("placeholder", label_money);
+		}
+		if (text.val() == 3) {
+			text_t.attr("placeholder", label_credit);
+		}
+		if (text.val() == 2) {
+			text_t.attr("placeholder", label_content);
+		}
+		return content;
+	}
+</script>
+
+<%= error_messages_for 'bid' %>
+<!--[form:project]-->
+<p><%= l(:label_homeworks_form_new_description) %></p>
+<p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT  %></p>
+
+<p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %></p>
+<!-- <p><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe, 
+	:onChange => "show('bid_reward_type', 'bid_budget', '"+l(:label_bids_reward_what)+"','"+l(:label_bids_new_money)+"','"+l(:label_bids_new_credit)+"','"+l(:label_bids_new_content)+"')" %>
+	<%= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
+</p> -->
+<p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;" %><%= calendar_for('bid_deadline')%>
+</p>
+<p><%= f.select :homework_type, homework_type_option %>
+</p>
+<p><%= hidden_field_tag 'course_id', @project.id %>
+</p>
+<fieldset><legend><%= l(:label_attachment_plural) %></legend>
+<p><%= render :partial => 'attachments/form', :locals => {:container => @homework} %></p>
+</fieldset>
\ No newline at end of file
diff --git a/app/views/projects/_new_homework.html.erb b/app/views/projects/_new_homework.html.erb
new file mode 100644
index 000000000..1da188f3b
--- /dev/null
+++ b/app/views/projects/_new_homework.html.erb
@@ -0,0 +1,81 @@
+<!-- fq -->
+
+<style>
+	input[type="submit"].bid_btn {
+		vertical-align: middle;
+		width: 80px;
+		height: 30px;
+		line-height: 18px;
+		font-size: 14px;
+		color: rgb(0, 0, 0);
+		background: url("../images/button/bg106.jpg") no-repeat scroll left top transparent;
+		padding: 0px 0px 4px 0px;
+		border-radius: 2px;
+		border: 1px solid rgb(148, 148, 148);
+		box-shadow: none;
+		text-shadow: none;
+		margin-top: -10px;
+		margin-right: -5px;
+	}
+	textarea:focus {
+		border: #d5dee9 1px solid;
+	}
+</style>
+
+<script type="text/javascript" language="javascript">
+	function clearInfo(id, content) {
+		var text = $('#' + id);
+		if (text.val() == content) {
+			$('#' + id).val('');
+		}
+	}
+
+	function showInfo(id, content) {
+		var text = $('#' + id);
+		if (text.val() == '') {
+			$('#' + id).val(content);
+		}
+	}
+</script>
+<%= form_tag({:controller => 'bids',
+:action => 'new_bid',
+:remote => true,
+:method => :post,
+:id => 'new-bid-form'}) do %>
+
+<table border="0" width="600px" style="border-left: 1px solid #acaeb1; border-right: 1px solid #acaeb1;
+border-top: 1px solid #acaeb1; border-bottom: 1px solid #acaeb1; margin-top: 30px; margin-left: 30px;">
+	<tr>
+		<td colspan="2"><%= text_field_tag 'bid_title', "#{l(:label_requirement_name)}", :class => 'noline', :required => true, :onfocus => "clearInfo('bid_title', '#{l(:label_requirement_name)}')", :onblur => "showInfo('bid_title', '#{l(:label_requirement_name)}')"%></td>
+	</tr>
+	<tr>
+		<td colspan="2"><div class="tableline"></div></td>
+	</tr>
+	<tr>
+		<td colspan="2"><%= text_area_tag 'bid_description', "#{l(:label_requirement_description)}", :class => 'noline', :required => true, :style => "resize: none;", :rows => 6,
+		:onfocus => "clearInfo('bid_description', '#{l(:label_requirement_description)}')", :onblur => "showInfo('bid_description', '#{l(:label_requirement_description)}')" %></td>
+	</tr>
+	<tr>
+		<td colspan="2"><div class="tableline"></div></td>
+	</tr>
+	<!-- <tr>
+	<td width="22%"><%= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '2'>#{l(:label_reward_1)}</option><option value = '3'>#{l(:label_bids_credit)}</option>".html_safe, :class => 'noline' %></td>
+	<td><%= text_field_tag 'bid_budget', "#{l(:label_requirement_bargain_money)}", :class => 'noline', :required => true,
+	:onfocus => "clearInfo('bid_budget', '#{l(:label_requirement_bargain_money)}')", :onblur => "showInfo('bid_budget', '#{l(:label_requirement_bargain_money)}')" %>
+	</td>
+	</tr> -->
+	<tr>
+		<td colspan="2"><div class="tableline"></div></td>
+	</tr>
+	<tr>
+		<td colspan="2"><%= text_field_tag 'bid_deadline', "#{l(:label_deadline)}", :class => 'noline', :required => true,
+		:onfocus => "clearInfo('bid_deadline', '#{l(:label_deadline)}')", :onblur => "showInfo('bid_deadline', '#{l(:label_deadline)}')"%>
+		<%= calendar_for('bid_deadline')%></td>
+	</tr>
+</table>
+<table id="bidding_table" border="0" width="600" style="margin-top: 10px; margin-left: 30px;">
+	<tr>
+		<td align="right"> <%= submit_tag l(:button_new_bid), :name => nil , :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%> </td>
+	</tr>
+</table>
+<%end%>
\ No newline at end of file
diff --git a/app/views/projects/_new_join.html.erb b/app/views/projects/_new_join.html.erb
new file mode 100644
index 000000000..ca06715f3
--- /dev/null
+++ b/app/views/projects/_new_join.html.erb
@@ -0,0 +1,54 @@
+<!-- added by fq -->
+<style>
+	input[type="submit"].bid_btn {
+		vertical-align: middle;
+		width: 60px;/*modified by ming*/
+		height: 25px;
+		line-height: 19px;
+		font-size: 14px;
+		color: rgb(0, 0, 0);
+		background: buttonface;/*url("/images/button/bg103.jpg") no-repeat scroll left top transparent;*/ 
+		padding: 0px 0px 4px 0px;
+		border-radius: 2px;
+		border: 1px solid rgb(148, 148, 148);
+		box-shadow: none;
+		text-shadow: none;
+		margin-top: -10px;
+		/*margin-right: -4px;*/
+	}
+	input[type="button"].bid_btn {
+		width: 60px;/*modified by ming*/
+		height: 25px;
+		line-height: 19px;
+		font-size: 14px;
+		color: rgb(0, 0, 0);
+		background: buttonface;/*url("/images/button/bg103.jpg") no-repeat scroll left top transparent;*/
+		padding: 0px 0px 4px 0px;
+		border-radius: 2px;
+		border: 1px solid rgb(148, 148, 148);
+		box-shadow: none;
+		text-shadow: none;
+		margin-top: -10px;
+		margin-right: -2px;
+	}
+	textarea:focus {
+		border: #d5dee9 1px solid;
+	}
+</style>
+
+<h3 class="title">请输入课程密码</h3>
+
+<%= form_tag({:controller => 'courses',
+              :action => 'join',
+              :object_id => course.id},
+             :remote => true,
+             :method => :post,
+             :id => 'new-watcher-form') do %>
+
+  <%= text_field_tag 'course_password', nil, :size => 48%>
+
+  <p class="buttons" style="padding-top: 10px; padding-bottom: 1px; margin-bottom: 1px">
+    <%= submit_tag '加入', :name => nil, :class => "bid_btn", :onclick => "hideModal(this);" %>
+    <%= submit_tag l(:button_cancel), :name => nil, :class => "bid_btn", :onclick => "hideModal(this);", :type => 'button' %>
+  </p>
+<% end %>
diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb
index 0a1384353..8042cfe4d 100644
--- a/app/views/projects/_project.html.erb
+++ b/app/views/projects/_project.html.erb
@@ -25,7 +25,14 @@
 </div>
 <div class="add-info">
 	<div class="main-language">
-		<%= content_tag('span', "#{l(:default_role_manager)}: ") %>
+		<!-- add by huang -->
+		 <% if(@project.project_type==1)%>
+			<%= content_tag('span', "#{l(:field_tea_name)}: ") %>
+		<% else %>
+			<%= content_tag('span', "#{l(:default_role_manager)}: ") %>
+		<% end %> 
+		<!-- end  -->
+		<!-- <%= content_tag('span', "#{l(:default_role_manager)}: ") %> -->
 		<% @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)  %>
diff --git a/app/views/projects/homework.html.erb b/app/views/projects/homework.html.erb
new file mode 100644
index 000000000..8db482544
--- /dev/null
+++ b/app/views/projects/homework.html.erb
@@ -0,0 +1,28 @@
+<!-- fq -->
+
+<div class="project-search-block">
+	<table width="100%" valign="center">
+		<tr>
+			<td width="16%"><span style="margin-left:0px"><%= l(:label_course_homework_list)%></span></td>
+			<td valign="center"><% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 3, 7)).size >0))%>
+	
+		<!-- <div class='icon icon-add'> -->
+			<%= link_to(l(:label_course_homework_new), {:controller => 'projects', :action => 'new_homework'}, :class => 'icon icon-add') %>
+			<!-- <%= toggle_link l(:label_new_call), 'put-bid-form', {:focus => 'project_id'} %> -->
+		<!-- </div> -->
+	<% end %></td> 
+	
+
+	<td align="right">
+	<div class="project-search">
+		<%= text_field_tag 'name', params[:name], :size => 30 %>
+		<%= submit_tag l(:label_search), :class => "small", :name => nil %>
+	</div></td>
+	</tr></table>
+</div>
+
+
+<div id="bid-show">
+	<%= render :partial => 'bids/bid_homework_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %>
+</div>
+
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
index fae7d8bad..7f62bf070 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -7,8 +7,8 @@
 	<table width="100%" valign="center">
 		<tr>
 			<td width="16%"><span style="margin-left:0px"><%= l(:label_project_plural)%></span></td>
-			<td valign="center"><%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>
-
+			<td valign="center"><%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>
+            <td valign="center"><%= link_to(l(:label_course_new), {:controller => 'projects', :action => 'new', :course => 1}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>
 			<td align="right">
 			<div class="project-search">
 				<%= text_field_tag 'name', params[:name], :size => 30 %>
@@ -17,7 +17,54 @@
 		</tr>
 	</table>
 </div>
-<%end%>
+<% end %>
+
+<%= sort_project(@s_type)%>
+<!-- <div class="pagination_list">
+<ul>
+	<li>
+		<%= link_to l(:label_sort_by_time), projects_path(:project_sort_type => '0'),:class=>"test_new" %>
+	</li>
+	<li>
+		<%= link_to l(:label_sort_by_active), projects_path(:project_sort_type => '1'),:class=>"test_new" %>
+	</li>
+	<li>
+		<%= link_to l(:label_sort_by_influence), projects_path(:project_sort_type => '2'),:class=>"test_new" %>
+	</li>
+</ul>
+</div> -->
+
+
+<!-- <div class="pagination_list">
+<ul>
+	<li>
+		<%= link_to l(:label_sort_by_time), projects_path(:project_sort_type => '0'),:class=>"test_new" %>
+	</li>
+	<li>
+		<%= link_to l(:label_sort_by_active), projects_path(:project_sort_type => '1'),:class=>"test_new" %>
+	</li>
+	<li>
+		<%= link_to l(:label_sort_by_influence), projects_path(:project_sort_type => '2'),:class=>"test_new" %>
+	</li>
+</ul>
+</div> -->
+
+
+<%= sort_project(@s_type)%>
+<!-- <div class="pagination_list">
+<ul>
+	<li>
+		<%= link_to l(:label_sort_by_time), projects_path(:project_sort_type => '0'),:class=>"test_new" %>
+	</li>
+	<li>
+		<%= link_to l(:label_sort_by_active), projects_path(:project_sort_type => '1'),:class=>"test_new" %>
+	</li>
+	<li>
+		<%= link_to l(:label_sort_by_influence), projects_path(:project_sort_type => '2'),:class=>"test_new" %>
+	</li>
+</ul>
+</div> -->
+
 
 <%= sort_project(@s_type)%>
 <!-- <div class="pagination_list">
@@ -38,7 +85,7 @@
 <div id="projects-index">
 	<%= render_project_hierarchy(@projects)%>
 </div>
-<!-- <p class="pagination"><%= pagination_links_full @project_pages%></p> -->
+
 <div class="pagination">
 	<ul>
 		<%= pagination_links_full @project_pages %>
diff --git a/app/views/projects/member.html.erb b/app/views/projects/member.html.erb
index 0377e9f6f..0a11d7bd2 100644
--- a/app/views/projects/member.html.erb
+++ b/app/views/projects/member.html.erb
@@ -14,7 +14,23 @@
     <% end %>
     <%= member.user.nil? ? '' : (link_to image_tag(url_to_avatar(member.user), :class => 'avatar'), :class => "avatar")  %>
     <%= content_tag "div", link_to_user(member.principal), :class => "nomargin avatar_name" %>
+    <!-- added by huang -->
+    <% if @project.project_type == 1 %>     				
+      <div class ="clear avatar_name"> <p>
+      	<% if member.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
+      	Teacher
+      	<% elsif member.roles.sort.collect(&:to_s).join(', ') =='Reporter' %>
+      	Student
+      	<% elsif member.roles.sort.collect(&:to_s).join(', ') =='TA' %>
+      	TA 
+      	<% else %>
+      	
+      	<% end %>     	    	
+      </p></div>				      				   
+    <% else%>
     <%= content_tag "div", content_tag("p", member.roles.sort.collect(&:to_s).join(', ')), :class => "clear avatar_name" %>
+    <% end %>
+    <!-- end -->
     <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
         
 </div>
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index 4f34d4988..027559317 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -1,12 +1,19 @@
-<h3><%=l(:label_project_new)%></h3>
-
 <%= labelled_form_for @project do |f| %>
 <!--Added by young-->
-<div class="box tabular">
-	<%= render :partial => 'form', :locals => { :f => f } %>
-	<%= submit_tag l(:button_create) %>
-	<%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
-	<%= javascript_tag "$('#project_name').focus();" %>
-	<% end %>
-</div>
+	<% if @course_tag == '1' %>
+		<h3><%=l(:label_course_new)%></h3>
+		<div class="box tabular">
+    	<%= render :partial => 'course_form', :locals => { :f => f } %>
+    	<%= submit_tag l(:button_create) %>
+	    <%= submit_tag l(:button_create_and_continue), :name => 'course_continue' %>
+    <% else %>
+		<h3><%=l(:label_project_new)%></h3>
+		<div class="box tabular">
+    	<%= render :partial => 'form', :locals => { :f => f } %>
+    	<%= submit_tag l(:button_create) %>
+	    <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>	
+    <% end %>	
+	<%= javascript_tag "$('#project_name').focus();" %>	
+    </div>
+<% end %>
 <!--Ended by young-->
diff --git a/app/views/projects/new_homework.html.erb b/app/views/projects/new_homework.html.erb
new file mode 100644
index 000000000..3737a6509
--- /dev/null
+++ b/app/views/projects/new_homework.html.erb
@@ -0,0 +1,9 @@
+<h3><%=l(:label_course_new_homework)%></h3>
+
+<%= labelled_form_for @homework, :url => {:controller => 'bids', :action => 'create_homework'} do |f| %>
+<div class="box tabular">
+	<%= render :partial => 'homework_form', :locals => { :f => f } %>
+	<%= submit_tag l(:button_create) %>
+	<%= javascript_tag "$('#bid_name').focus();" %>
+	<% end %>
+</div>
\ No newline at end of file
diff --git a/app/views/projects/new_join.js.erb b/app/views/projects/new_join.js.erb
new file mode 100644
index 000000000..c0a6f4a50
--- /dev/null
+++ b/app/views/projects/new_join.js.erb
@@ -0,0 +1,3 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/new_join', :locals => {:course => @course}) %>');
+showModal('ajax-modal', '400px');
+$('#ajax-modal').addClass('new-watcher');
diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb
index d95ccb6ac..6682ced76 100644
--- a/app/views/projects/settings.html.erb
+++ b/app/views/projects/settings.html.erb
@@ -1,3 +1,7 @@
 <h3><%=l(:label_settings)%></h3>
-<%= render_tabs project_settings_tabs %>
+<% if @project.project_type == 1 %>
+	<%= render_tabs course_settings_tabs %>
+<% else %>
+	<%= render_tabs project_settings_tabs %>
+<% end %>
 <% html_title(l(:label_settings)) -%>
diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb
index e4b00fdb6..c4670e85c 100644
--- a/app/views/projects/settings/_members.html.erb
+++ b/app/views/projects/settings/_members.html.erb
@@ -17,7 +17,22 @@
 			<div class="splitcontentright" style="width:30%;margin-top: 60px;">
     			<p><%= l(:label_role_plural) %>:
     			<% roles.each do |role| %>
-      			<label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
+      			<label>
+      			<% if @project.project_type == 1 %>
+      				<% if role == Role.find(3) %>
+      				<%= check_box_tag 'membership[role_ids][]', role.id %>Teacher
+      				<% elsif role == Role.find(5) %>
+      				<%= check_box_tag 'membership[role_ids][]', role.id %>Student
+      				<% elsif role == Role.find(4)%>
+      				<% else %>
+      				<%= check_box_tag 'membership[role_ids][]', role.id %><%=h role %>
+      				<% end %>
+      			<% else %>
+      				<% if role == Role.find(7) %>
+      				<% else %>
+      				<%= check_box_tag 'membership[role_ids][]', role.id %><%=h role %>
+      				<% end %>
+      			<% end %></label>
      			<% end %></p>	
     		</div>
     	</fieldset>
@@ -40,11 +55,39 @@
   <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
   <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
   <td class="roles">
-    <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
+    <span id="member-<%= member.id %>-roles">
+    <% if @project.project_type == 1 %>     				
+       
+      	<% if member.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
+      	Teacher
+      	<% elsif member.roles.sort.collect(&:to_s).join(', ') =='Reporter' %>
+      	Student
+      	<% elsif member.roles.sort.collect(&:to_s).join(', ') =='TA' %>
+      	TA
+      	<% else %>
+      	
+      	<% end %>     	    	
+     			      				   
+    <% else %>  
+  
+      	<% if member.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
+      	Manager
+      	<% elsif member.roles.sort.collect(&:to_s).join(', ') =='Developer' %>
+      	Developer
+      	<% elsif member.roles.sort.collect(&:to_s).join(', ') =='Reporter' %>
+      	Reporter
+      	<% else %>    	
+      	<% end %> 
+      	 
+     <% end %>   
+    	</span>
+   
+    
       <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
                                           :method => :put,
                                           :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }}
              ) do |f| %>
+             
         <p><% roles.each do |role| %>
         <label><%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                                        :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
diff --git a/app/views/projects/settings/_repositories.html.erb b/app/views/projects/settings/_repositories.html.erb
index c0f4d263b..83da6f79d 100644
--- a/app/views/projects/settings/_repositories.html.erb
+++ b/app/views/projects/settings/_repositories.html.erb
@@ -55,11 +55,12 @@
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
 
+<% course_tag = @project.project_type %>
 <% if User.current.allowed_to?(:manage_repository, @project) %>
-  <p><%= link_to l(:label_repository_new), new_project_repository_path(@project), :class => 'icon icon-add' %></p>
+  <p><%= link_to l(:label_repository_new), new_project_repository_path(@project, :course => course_tag), :class => 'icon icon-add' %></p>
 <% end %>
 <!-- no repository  ，new  by xianbo-->
 <% if User.current.allowed_to?(:manage_repository, @project) %>
   <p><%= l(:label_repository_no) %> 
-  	<%= link_to l(:label_repository_new_repos), newrepo_project_repository_path(@project), :class => 'icon icon-add' %></p>
+  	<%= link_to l(:label_repository_new_repos), newrepo_project_repository_path(@project, :course => course_tag), :class => 'icon icon-add' %></p>
 <% end %>
\ No newline at end of file
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index cb7707781..b8d94ec3d 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -10,7 +10,7 @@
 	<div>
 		<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
 		<div class="issue-note">
-<table width="660px" border="0" align="center">
+<table width="660px" border="0" align="center" style="font-size: 14px;">
   <tr>
     <td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%></td>
     <td><table width="580px" border="0">
diff --git a/app/views/projects/statistics.html.erb b/app/views/projects/statistics.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/repositories/_navigation.html.erb b/app/views/repositories/_navigation.html.erb
index a42daa8f5..e46e0dac2 100644
--- a/app/views/repositories/_navigation.html.erb
+++ b/app/views/repositories/_navigation.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <%= link_to l(:label_statistics),
-            {:action => 'stats', :id => @project, :repository_id => @repository.identifier_param},
+            {:controller => 'repositories', :action => 'stats', :id => @project, :repository_id => @repository.identifier_param},
             :class => 'icon icon-stats' if @repository.supports_all_revisions? %>
 
 <%= form_tag({:action => controller.action_name,
diff --git a/app/views/repositories/stats.html.erb b/app/views/repositories/stats.html.erb
index 8299af0f6..d790f3d57 100644
--- a/app/views/repositories/stats.html.erb
+++ b/app/views/repositories/stats.html.erb
@@ -1,12 +1,6 @@
 <h3><%= l(:label_statistics) %></h3>
 
-<p>
-<%= tag("embed", :width => 670, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_month")) %>
-</p>
-<p>
-<%= tag("embed", :width => 670, :height => 400, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :repository_id => @repository.identifier_param, :graph => "commits_per_author")) %>
-</p>
-
-<p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
+<% src = "http://localhost:3000/statistics/"+@project_id+"/index.html"%>
+<iframe src=<%= src %> name="top" style="border:0;width:100%;height:1000px;"></iframe>
 
 <% html_title(l(:label_repository), l(:label_statistics)) -%>
diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index d123b9053..49a81da2a 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -35,7 +35,7 @@
               </div>
          <% end %>
     <% else %>
-         <div><%= l(:label_tags_no) %></div>
+         <div style="color:#919294;"><%= l(:label_tags_no) %></div>
     <% end %>
     
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/_my_course.html.erb b/app/views/users/_my_course.html.erb
new file mode 100644
index 000000000..1e155c5d9
--- /dev/null
+++ b/app/views/users/_my_course.html.erb
@@ -0,0 +1,57 @@
+<div class="content_frame">
+	<% unless @memberships.empty? %>
+	<ul class="user_project_sort">
+		<% for membership in @memberships %>
+		<li>
+			<table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
+				<tr>
+					<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(membership.project), :class => 'avatar'), project_path(membership.project) %></td>
+					<td>
+					<table width="580" border="0">
+						<tr>
+							<td colspan="2" valign="top"><span><%= link_to_project(membership.project) %></span>
+								<span style="float: right"><%= l(:label_homework) %> (<span class=""><%= link_to (membership.project.homeworks.count), {:controller => 'projects', :action => 'homework', :id => membership.project.identifier} %></span>)
+								&nbsp;&nbsp;&nbsp;
+								<%= l(:label_course_news)%> (<span style="color: #ed8924"><%= link_to (membership.project.news.count), {:controller => 'news', :action => 'index', :project_id => membership.project.identifier} %></span>)
+								<!-- <%= l(:label_member)%>(<span style="color: #ed8924"><%= link_to (membership.project.members.count), {:controller => 'news', :action => 'index', :project_id => membership.project.identifier} %></span>) </span> --></td>
+						</tr>
+						<tr>
+							<td colspan="2" width="580" >
+							<p class="font_description">
+								<%= membership.project.description%>
+							</p></td>
+						</tr>
+						<tr>
+							<td align="left"><span class="font_lighter"> <%= format_time(membership.created_on) %></span></td><!-- modified by ming -->
+							<td  align="right" > 
+								
+							<% if membership.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
+							Teacher
+							<% elsif membership.roles.sort.collect(&:to_s).join(', ') =='Reporter' %>
+							Student
+							<% elsif membership.roles.sort.collect(&:to_s).join(', ') =='TA' %>
+							TA
+							<% end %>
+						    </td>
+						</tr>
+					</table></td>
+				</tr>
+
+			</table>
+
+		</li>
+		<% end %>
+	</ul>
+	<% else %>
+	<% if @user != User.current %>
+	<p class="font_description">
+		<%= l(:label_project_course_un) %>
+	</p>
+	<% else %>
+	<p class="font_description">
+		<%= l(:label_project_course_unadd) %><%= link_to"#{l(:label_new)}",:controller=>'projects',:action=>'new', :course => 1 %>
+	</p>
+	<% end %>
+	<% end %>
+	<%= call_hook :view_account_left_bottom, :user => @user %>
+</div>
diff --git a/app/views/users/_my_homework.html.erb b/app/views/users/_my_homework.html.erb
new file mode 100644
index 000000000..4c4bd2138
--- /dev/null
+++ b/app/views/users/_my_homework.html.erb
@@ -0,0 +1,48 @@
+<!-- fq -->
+<% if @bid.size > 0%>
+
+<% @bid.each do |bids|%>
+<h2><%= link_to(Project.find(bids[0]).name, project_path(bids[0])) %></h2>
+
+<% for bid in bids[1]%>	
+
+<table width="95%" border="0" style="padding-left: 10px; padding-top: 10px;">
+	<tr>
+		<td colspan="2" valign="top" width="50" ><%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %></td>
+		<td>
+		<table width="100%" border="0">
+			<tr>
+				<td colspan="2" valign="top"><strong><%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>: &nbsp;<%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %></strong></td>
+			</tr>
+			<tr>
+				<td width="500">
+				<table border="0">
+					<tr>
+						<td> <% if bid.reward_type.nil? or bid.reward_type == 1 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %><%= bid.budget%></span></strong> <% elsif bid.reward_type == 2 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> <% else %> <!-- <strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %>&nbsp;<%= bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong> --> <% end %> <!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> --></td>
+					</tr>
+					<tr>
+						<td><span class="font_lighter"><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></strong>)</span><span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span></td>
+					</tr>
+				</table></td>
+				<td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td>
+			</tr>
+			<tr>
+				<td>
+				<div class="bid-description" style="border-left:  1px solid rgb(225, 225, 225); border-bottom: 1px solid rgb(225, 225, 225); padding-left: 20px; padding-bottom: 10px; margin-bottom: 20px;">
+					<table width="100%">
+						<tr>
+							<td> <%= bid.description%> </td>
+						</tr>
+					</table>
+				</div></td>
+			</tr>
+		</table></td>
+	</tr>
+</table>
+
+<% end %>
+<% end %>
+
+<% else %>
+<p class="font_description">暂无任何作业</p>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_my_notice.html.erb b/app/views/users/_my_notice.html.erb
new file mode 100644
index 000000000..c317865e7
--- /dev/null
+++ b/app/views/users/_my_notice.html.erb
@@ -0,0 +1,48 @@
+<!-- < added by huang > -->
+<div class="content_frame">
+<% unless @memberships.empty? %>
+<ul class="user_project_sort">
+	<% for membership in @memberships %>
+	<li>
+		<table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
+			<tr>
+				<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(membership.project), :class => 'avatar'), project_path(membership.project) %></td>
+				<td>
+				<table width="580" border="0">
+					<tr>
+						<td colspan="2" valign="top"><span><%= link_to_project(membership.project) %></span>
+							<span style="float: right"><%= l(:label_homework) %> (<span style="color: #ed8924">8</span>)
+							<%= l(:label_course_news)%> (<span style="color: #ed8924">8</span>)							
+							<%= l(:label_member)%>(<span style="color: #ed8924"><%=link_to (membership.project.members.count)%></span>)							
+							</span>
+							
+						</td>
+					</tr>					
+					<tr>
+						<td colspan="2" width="580" >
+						<p class="font_description">
+							<%= membership.project.description%>
+						</p></td>
+					</tr>
+					<tr>
+						<td align="left"><span class="font_lighter"> <%= format_time(membership.created_on) %></span></td><!-- modified by ming -->
+						<td  align="right" ><%= h membership.roles.sort.collect(&:to_s).join(', ') %> </td>
+					</tr>
+				</table></td>
+			</tr>
+			
+		</table>
+		
+	</li>
+	<% end %>
+</ul>
+<% else %>
+<% if @user != User.current %>
+<p class="font_description"><%= l(:label_project_un) %></p>
+<% else %>
+<p class="font_description"><%= l(:label_project_unadd) %><%= link_to"#{l(:label_new)}",:controller=>'projects',:action=>'new'%></p>
+<% end %>
+
+<% end %>
+<%= call_hook :view_account_left_bottom, :user => @user %>
+</div>
diff --git a/app/views/users/info.html.erb b/app/views/users/info.html.erb
index d3940caf5..e63b71817 100644
--- a/app/views/users/info.html.erb
+++ b/app/views/users/info.html.erb
@@ -2,7 +2,7 @@
 <% unless @message.empty? %>
 <div id="activity">
 	<% @message.each do |e| -%>
-	<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;">
+	<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
 		<tr>
 			<!-- fq -->
 			<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(e.user), :class => "avatar"), user_path(e.user), :class => "avatar" %></td>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 6bd74fdb8..14b3556e5 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -7,7 +7,7 @@
 	<% @activity.each do |e| %>
 	<% act = e.act %>
 	<% unless act.nil? %>
-	<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;">
+	<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
 		<tr>
 			<!-- fq -->
 			<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(e.user), :class => "avatar"), user_path(e.user_id), :class => "avatar" %></td>
diff --git a/app/views/users/user_courses.html.erb b/app/views/users/user_courses.html.erb
new file mode 100644
index 000000000..409a38acd
--- /dev/null
+++ b/app/views/users/user_courses.html.erb
@@ -0,0 +1,11 @@
+<!-- added by fq -->
+
+<%= user_course @state%>
+<% if @state == 0 %>
+<%= render :partial => 'my_course' %>
+<% elsif @state == 1 %>
+<%= render :partial => 'my_homework' %>
+<% else @state == 2 %>
+<%= render :partial => 'my_notice' %>
+<% end %>
+
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index 55340902b..643ccfe96 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -6,7 +6,7 @@
 <%= l(:label_newfeedback_message) %>（<%= @feedback_count%>）
 </div>
 
-<div id="message">
+<div id="message" style="font-size: 14px;">
     <%= render :partial => 'words/message', :locals => {:jour => @jour, :state => @state, :user => @user, :feedback_pages => @feedback_pages} %>
 </div>
 <div class="pagination" style="float:left;">
diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb
index f595669e4..0f71d20b4 100644
--- a/app/views/users/user_projects.html.erb
+++ b/app/views/users/user_projects.html.erb
@@ -4,7 +4,7 @@
 <ul class="user_project_sort">
 	<% for membership in @memberships %>
 	<li>
-		<table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;">
+		<table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
 			<tr>
 				<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(membership.project), :class => 'avatar'), project_path(membership.project) %></td>
 				<td>
diff --git a/app/views/users/watch_bids.html.erb b/app/views/users/watch_bids.html.erb
index 88b2c595b..747b79467 100644
--- a/app/views/users/watch_bids.html.erb
+++ b/app/views/users/watch_bids.html.erb
@@ -5,7 +5,7 @@
 
 <% for bid in @bid%>
 
-<table width="90%" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px; margin-top: 30px;">
+<table width="90%" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px; margin-top: 30px;font-size:14px;">
 	<tr>
 		<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(bid.author), :class => 'avatar'),user_path(bid.author), :class => "avatar" %></td>
 		<td>
@@ -18,19 +18,24 @@
 				<table border="0">
 					<tr><td>
 						<% if bid.reward_type.nil? or bid.reward_type == 1%>
-				<strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %><%= bid.budget%></span></strong>
+				<strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: ΢���ź�"><%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %><%= bid.budget%></span></strong>
 				<% elsif bid.reward_type == 2%>
-				<strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong>
+				<strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: ΢���ź�"><%= bid.budget%></span></strong>
 				<% else %>
-				<strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %>&nbsp;<%= bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong>
+				<strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: ΢���ź�"><%= l(:label_bids_credit) %>&nbsp;<%= bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong>
 				<% end %>
 						
 						<!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> -->
 						</td>
 					</tr>
 					<tr><td>
-						<span class="font_lighter"><%= l(:label_x_biding_project, :count => bid.biding_projects.count) %>(<strong><%=link_to bid.biding_projects.count, project_for_bid_path(bid) %></strong>)</span>
+						<% if bid.reward_type == 3 %>
+						<span class="font_lighter"><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%=link_to bid.biding_projects.count, project_for_bid_path(bid) %></strong>)</span>												
 						<span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%=link_to bid.commit, respond_path(bid) %></strong>)</span>
+						<% else %>
+						<span class="font_lighter"><%= l(:label_x_biding_project, :count => bid.biding_projects.count) %>(<strong><%=link_to bid.biding_projects.count, project_for_bid_path(bid) %></strong>)</span>											
+						<span class="font_lighter"><%= l(:label_x_bids_responses, :count => bid.commit) %>(<strong><%=link_to bid.commit, respond_path(bid) %></strong>)</span>						
+						<% end %>
 						<span class="font_lighter"><%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<strong><%=link_to bid.watcher_users.count, respond_path(bid) %></strong>)</span>
 						</td>
 					</tr>
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index a95adc131..2eef3f356 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -61,7 +61,6 @@
     				<caption>&#187;<%= l(:label_related_issues) %></caption>
    				 	<% issues.each do |issue| -%>
       				<tr class="hascontextmenu">
-        				<td class="checkbox"><%= check_box_tag 'ids[]', issue.id, false, :id => nil %></td>
         				<td><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
      				</tr>
     				<% end -%>
diff --git a/app/views/watchers/_set_join.js.erb b/app/views/watchers/_set_join.js.erb
new file mode 100644
index 000000000..cd6ca1b59
--- /dev/null
+++ b/app/views/watchers/_set_join.js.erb
@@ -0,0 +1,3 @@
+
+
+$('#join').html('<%= escape_javascript join_in_course(course, user) %>');
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a423b8b83..e4f9941f2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -656,7 +656,7 @@ en:
   label_query_new: New query
   label_my_queries: My custom queries
   label_filter_add: Add filter
-  label_filter_plural: Filter
+  label_filter_plural: Query condition
   label_equals: is
   label_not_equals: is not
   label_in_less_than: in less than
@@ -917,8 +917,8 @@ en:
   button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"
   button_add: Add
   button_change: Change
-  button_apply: Apply
-  button_clear: Clear
+  button_apply: Query
+  button_clear: Cancel query
   button_lock: Lock
   button_unlock: Unlock
   button_download: Download
@@ -1416,13 +1416,19 @@ en:
   label_identity: Identity
   label_teacher: Teacher
   label_student: Student
-  label_enterprise: Enterprise
-  label_developer: Developer
+  label_other: Other
   label_gender: Gender
   label_gender_male: male
   label_gender_female: female
   label_location: Location
-  label_brief_introduction: Modified my status
-  label_my_brief_introduction: Howdy guys! please leave your foot print~
 #end
+  label_course: Course
+  label_course_new: New course
+  label_public_info: If you don't choose public, only the project's members can see the project.
+  label_course_student: Student
+  label_homework: Homework
+  label_course_new_homework: New homework
+  label_course_homework_list: Homework List
+  label_course_homework_new: new homework
+  label_course_data: Data
 
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index cef6891b5..c7171cab3 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -216,6 +216,14 @@ zh:
 
 
   field_name: 名称
+  #added by huang
+  field_tea_name: 教师
+  field_location: 工作单位
+  field_couurse_time: 学时
+  field_course_code: 学分
+  field_state: 加入课程口令
+  field_term: 学期
+  #end
   field_description: 描述
   field_summary: 摘要
   field_is_required: 必填
@@ -253,6 +261,8 @@ zh:
   field_principal: 用户/用户组
   field_role: 角色
   field_homepage: 主页
+  field_time: 课时
+  field_code: 学分
   field_is_public: 公开
   field_parent: 上级项目
   field_is_in_roadmap: 在路线图中显示
@@ -510,6 +520,20 @@ zh:
   label_activities_settings: 显示设置
   label_user_login_new: 登录
   label_user_login_tips: 您还没有登录，请登录后留言
+  #end
+  #by huang
+  label_term: 学期
+  label_spring: 春季
+  label_summer: 夏季
+  label_autumn: 秋季
+  label_followers: 关注
+  label_teacher: 教师
+  label_limit_time: 截止日期
+  label_commit_homework: 提交作业
+  label_course_homework: 对应课程
+  label_homework_response: 作业咨询
+  label_bidding_homework: 提交作业
+  
   #end
   label_my_page: 我的工作台
   label_my_account: 我的帐号
@@ -552,6 +576,7 @@ zh:
   label_history: 历史记录
   label_attachment: 文件
   label_attachment_new: 新建文件
+  label_file_upload: 上传资料
   label_attachment_delete: 删除文件
   label_attachment_plural: 文件
   label_file_added: 文件已添加
@@ -559,12 +584,20 @@ zh:
   label_report_plural: 报表
   label_news: 新闻
   label_news_new: 添加新闻
+  bale_news_notice: 添加通知 #huang
+  label_news_notice: 发布课程通知
   label_news_plural: 新闻
   label_news_latest: 最近的新闻
   label_news_view_all: 查看所有新闻
   label_news_added: 新闻已添加
   label_settings: 配置
-  label_overview: 活动
+  label_overview: 项目动态
+  label_course_overview: "课程动态"
+  label_question_student: 学生反馈 #huang
+  label_homework_commit: 提交作业 #huang
+  label_homework_info: 作业情况  #huang
+  label_course_file: 资料下载
+  label_course_news: 课程通知
   label_version: 版本
   label_version_new: 新建版本
   label_version_plural: 版本
@@ -623,7 +656,7 @@ zh:
   label_query_new: 新建查询
   label_filter_add: 增加过滤器
 
-  label_filter_plural: 过滤器
+  label_filter_plural: 查询条件
   label_equals: 等于
   label_not_equals: 不等于
   label_in_less_than: 剩余天数小于
@@ -648,6 +681,7 @@ zh:
   label_not_contains: 不包含
   label_day_plural: 天
   label_repository: 版本库
+  label_course_repository: 代码库
   label_repository_plural: 版本库
   label_browse: 浏览
   label_branch: 分支
@@ -787,11 +821,12 @@ zh:
   label_project_issues: "缺陷"
   label_project_newother: "查看其他评论"
   label_project_newshare: "分享了"
+  label_project_notice: "发布了通知："
   label_project_newadd: "添加了"
   label_project_unadd: "暂无项目，赶快去创建吧！"
   label_project_un: "该用户暂未参与任何项目！"
-  
-  
+  label_project_course_un: "该用户暂未加入任何课程！"
+  label_project_course_unadd: "你还未创建课程，赶快去创建吧！"   
   #end by huang
   label_user_mail_option_selected: "收取选中项目的所有通知..."
   label_user_mail_option_none: "不收取任何通知"
@@ -865,8 +900,9 @@ zh:
   button_add: 新增
   button_change: 修改
 
-  button_apply: 应用
-  button_clear: 清除
+  button_apply: 查询
+  button_clear: 取消查询
+  button_clear_requirement: 取消
   button_lock: 锁定
   button_unlock: 解锁
   button_download: 下载
@@ -924,6 +960,7 @@ zh:
   text_caracters_maximum: "最多 %{count} 个字符。"
   text_caracters_minimum: "至少需要 %{count} 个字符。"
   text_length_between: "长度必须在 %{min} 到 %{max} 个字符之间。"
+  text_command: 口令仅数字可以使用,学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。
   text_tracker_no_workflow: 此跟踪标签未定义工作流程
   text_unallowed_characters: 非法字符
   text_comma_separated: 可以使用多个值（用逗号,分开）。
@@ -1227,8 +1264,14 @@ zh:
   field_add: 添加于 %{time} 之前
   button_more: 更多
   label_user_response: 用户反馈
+  label_student_response: 学生反馈
   label_bidding_project: 参与项目 
+  label_homework_project: 已提交作业 #huang
   button_bidding: 我要参加
+  
+  button_bidding_homework: 提交作业 #huang
+  field_homework_type: 作业类型
+  label_homework_respond: 作业情况
 
   label_new_call: 发布需求
   label_user_information: "与我相关"
@@ -1237,19 +1280,35 @@ zh:
   label_wrong_date: 时间格式错误，请输入正确的时间 yyyy-mm-dd
   label_bidding_succeed: 应标成功
   label_bidding_fail: 应标失败，该项目已经应标
+  label_bidding_homework_fail: 作业提交失败，该作业已经被提交！
   
   label_requirement_list: 需求列表
 
   label_x_biding_project:  #modify by men
-    zero: 项目
-    one: 项目
-    other: 项目
+    zero: 应标项目
+    one: 应标项目
+    other: 应标项目
+  #end
+  label_x_homework_project:  #modify by huang
+    zero: 已提交的作业
+    one: 已提交的作业
+    other: 已提交的作业
   #end
   label_x_responses: #modify by men
     zero: 留言
     one: 留言
     other: 留言
   #end
+  label_x_responses: #modify by huang
+    zero: 学生提问
+    one: 学生提问
+    other: 学生提问
+  #end
+  label_x_bids_responses: #modify by huang
+    zero: 用户反馈
+    one: 用户反馈
+    other: 用户反馈
+  #end
   label_x_followers: #modify by men
     zero: 关注
     one: 关注
@@ -1260,7 +1319,9 @@ zh:
   label_investment_budget: 投资预算：
   label_investment_time_limit: 投资时限：
   label_my_respond: 我要反馈：
+  label_my_question: 有疑问请在此处提出！
   label_respond_requirement: 对需求进行了反馈
+  label_question_requirement: 对作业提出了问题！
   label_deadline: 投资时限yyyy-mm-dd
   label_requirement_name: 为你的需求起个名字~~
   label_requirement_description: 内容：对你的需求进行描述
@@ -1274,6 +1335,7 @@ zh:
   label_praise: 赞
   label_cancel_praise: 取消赞
   label_bid_reason: 请输入参与理由
+  label_bid_reason_homework: 请输入作业提交说明！
   label_create_new_projects: 创建项目
   label_call_for_bids: 发布需求
   label_create_course: 创建课程
@@ -1293,8 +1355,11 @@ zh:
   label_my: 我
   label_i: 我
   label_join_bidding: 参与了应标
+  label_jion_bidding_homework: 已提交！
   label_bidding_user: 应标人：
+  label_bidding_user_homework: 作业提交者
   label_bidding_reason: 应标宣言：
+  label_bidding_reason_homewrok: 作业提交说明
   label_username: 用户名：
   label_password: 密码：
   label_about_requirement: 对需求：
@@ -1356,6 +1421,7 @@ zh:
   field_birthday: 生日
   field_brief_introduction: 个人简介
   field_location: 现住址
+  field_occupation: 工作单位
   field_work_experience: 工作经验(年)
   field_zip_code: 邮编
   label_reward: 奖励：
@@ -1375,14 +1441,17 @@ zh:
   label_issue_cancel_query: 取消查询
   field_reward_type: 奖励类型
   label_tags_no: 暂无标签！
+  label_course_description_no: 你还未对该课程添加描述！
   label_bid_publish: 发布了
   label_bid_project: 项目
   label_project_no_follow: 该项目暂未被关注！
   label_no_bid_project: 暂无参与项目
+  label_no_course_project: 暂无已提交的作业！
   label_bids_reward_method: 奖励方式 ：
   label_bids_reward_what: 输入奖励内容
   label_call_bonus: 奖金
   label_bids_form_new_description: 发布一个需求，一次竞赛或者一个课程的作业
+  label_homeworks_form_new_description: 发布一个作业，作业提交方式可以是附件或者项目形式，在作业类型里面设置。
   label_bids_new_money: 输入奖励金额，如 500,2.5等
   label_bids_new_credit: 输入该作业对应课程的学分，如 3,2.5等
   label_bids_new_content: 输入奖励内容，如 奖项，物品等
@@ -1395,6 +1464,7 @@ zh:
   label_welcome_trustie: Trustie
   label_welcome_trustie_description: 面向有创意和激情的高校大学生与创业者，提供社交化的项目管理、协同研究、软件开发和众包平台。
   label_user_project: 项目
+  label_user_course: 课程
   label_bid_respond_quote: 回复
   label_bid_if_agreement: 如果喜欢我，请点击我
   label_bid_respond_delete: 删除
@@ -1419,22 +1489,28 @@ zh:
   button_projects_feedback_respond: 回复
   label_projects_feedback_respond_content: 请输入回复内容
   label_user_create_project: 创建了
-
 #added by bai
   label_identity: 身份
-  label_teacher: 教师
+  label_teacher: 教 师
+  label_teacher_homework: 教师姓名
   label_student: 学生
-  label_enterprise: 企业
-  label_developer: 开发者
-  label_technical_title: "职称:"
+  label_other: 其他
   label_gender: 性别
   label_gender_male: 男
   label_gender_female: 女
-  label_location: "地区:"
-  field_occupation: "工作单位:"
-  notice_lost_location: 请选择地区信息
+  label_location: 地区
   label_brief_introduction: 修改我的状态
   label_my_brief_introduction: 今天的心情如何？留下你的脚印吧~
   #end
-
-
+  
+  label_course: 课程
+  label_course_new: 新建课程
+  label_public_info: 若不公开，仅项目成员可见该项目
+  label_course_student: 学生
+  label_homework: 课程作业
+  label_course_file: 资料共享
+  label_course_new_homework: 新建作业
+  label_course_homework_list: 作业列表
+  label_course_homework_new: 发布作业
+  label_course_data: 资料
+  label_homework_statistics: 作业统计
diff --git a/config/routes.rb b/config/routes.rb
index 5cbd1d051..b0c06bd77 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -89,6 +89,7 @@ RedmineApp::Application.routes.draw do
       match 'info', :to => 'users#info', :via => [:get , :post], :as => 'user_info'
       match 'user_watchlist', :to => 'users#user_watchlist',  :via => :get, :as => "user_watchlist" #add by huang
       match 'user_fanslist', :to => 'users#user_fanslist',  :via => :get, :as => "user_fanslist" #add by huang
+      match 'user_courses', :to => 'users#user_courses', :via => :get
     end
   end
   match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback',  :via => :get, :as => "feedback"
@@ -124,25 +125,19 @@ RedmineApp::Application.routes.draw do
   post 'issues/:object_id/watchers', :to => 'watchers#create', :object_type => 'issue'
   delete 'issues/:object_id/watchers/:user_id' => 'watchers#destroy', :object_type => 'issue'
   
-
- resources :projects do
+  resources :projects do
     member do
       get 'settings(/:tab)', :action => 'settings', :as => 'settings'
- #     get 'show', :action => 'show', :as => 'project_show'
- #     get 'activity', :controller => 'activities', :action => 'index', :as => 'activity'
- #     get 'repository', :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :as => 'repository'
       #by young
       get 'member', :controller => 'projects', :action => 'member', :as => 'member'
-#      get 'focus', :action => 'focus', :as => 'focus'
-#      get 'investor', :action => 'investor', :as => 'investor'
-#      get 'issue', :action =>'issue', :as => 'issue'
-#      get 'mission', :action => 'mission', :as => 'mission'
-#      get 'on', :action => 'on', :as => 'on'
       get 'file', :action => 'file', :as => 'file'
       get 'statistics', :action => 'statistics', :as => 'statistics'
       get 'feedback', :action => 'feedback', :as => 'project_feedback'
       get 'watcherlist', :action=> 'watcherlist'
       match 'user_watcherlist', :to => 'projects#watcherlist',  :via => :get, :as => "watcherlist" #add by huang
+      get 'homework', :action => 'homework', :as => 'homework'
+      get 'new_homework', :action => 'new_homework', :as => 'new_homework'
+      #get 'news', :action => 'news', :as => 'news'
       #end
       
       post 'modules'
@@ -156,14 +151,11 @@ RedmineApp::Application.routes.draw do
     
 #by young
    match '/member', :controller => 'projects', :action => 'member',  :as => 'member', :via => :get
-#   match '/focus', :controller => 'projects', :action => 'focus',  :as => 'focus', :via => :get
-#   match '/mission', :controller => 'projects', :action => 'mission',  :as => 'mission', :via => :get
-#   match '/on', :controller => 'projects', :action => 'on',  :as => 'on', :via => :get
-#   match '/settings(/:tab)', :controller => 'projects', :action => 'settings',  :as => 'settings', :via => :get
    match '/file', :controller => 'projects', :action => 'file',  :as => 'file', :via => :get
    match '/statistics', :controller => 'projects', :action => 'statistics',  :as => 'statistics', :via => :get
 #   match '/investor', :controller => 'projects', :action => 'investor',  :as => 'investor', :via => :get
-   
+    match '/homework', :controller => 'projects', :action => 'homework', :as => 'homework', :via => :get
+
 #   match '/activity', :controller => 'activities', :action => 'index',  :as => 'activity', :via => :get
 #   match '/repository', :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :as => 'repository', :via => :get
 #   match '/', :controller => 'projects', :action => 'show', :as => 'project_show', :via => :get
@@ -172,6 +164,7 @@ RedmineApp::Application.routes.draw do
    
 #   match '/show', :controller => 'projects', :action => 'show',  :as => 'project_show', :via => :get
     match '/watcherlist', :controller=>'projects', :action=> 'watcherlist', :as => 'watcherlist', :via => :get  #add by huang   
+   # matche '/news', :controller => 'news', :action => 'index', :as => 'news', :via => :get
 #end
 
     resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
@@ -442,10 +435,20 @@ RedmineApp::Application.routes.draw do
   get 'calls/back', :to=> 'bids#back'
   match 'calls/new_bid', :controller => 'bids', :action => 'new_bid'
   match 'calls/:id/show_project', :controller => 'bids', :action => 'show_project', :as => 'project_for_bid'
+  match 'calls/:id/show_project_homework', :controller => 'bids', :action => 'show_project_homework', :as => 'project_for_bid_homework' # by huang
   match 'calls/:id/add', :controller => 'bids', :action => 'add'
+  match 'calls/:id/add_homework', :controller => 'bids', :action => 'add_homework'
   match 'words/add_project_respond', :controller => 'words', :action => 'add_project_respond'
   match 'projects/:id/feedback', :to => 'projects#feedback',  :via => :get, :as => 'project_feedback'
   match 'calls/create_bid', :to => 'bids#create_bid'
+  match 'calls/create_homework', :to => 'bids#create_homework'
+  match 'calls/:id/homework_respond', :to => 'bids#homework_respond'
+  match 'calls/:id/homework_statistics', :to => 'bids#homework_statistics'
+  
+  post 'join_in/join', :to => 'courses#join', :as => 'join'
+  delete 'join_in/join', :to => 'courses#unjoin'
+  delete 'attachment/:id', :to => 'attachments#delete_homework'
+  match 'new_join', :to => 'projects#new_join', :as => 'try_join'
   match 'projects/:id/respond', :to => 'projects#project_respond', :via => :post
   ## 测试用
   # match 'test/index', :controller => 'test', :action => 'index'
diff --git a/db/migrate/20130827003308_add_project_type_to_project.rb b/db/migrate/20130827003308_add_project_type_to_project.rb
new file mode 100644
index 000000000..64455b638
--- /dev/null
+++ b/db/migrate/20130827003308_add_project_type_to_project.rb
@@ -0,0 +1,9 @@
+class AddProjectTypeToProject < ActiveRecord::Migration
+  def self.up
+    add_column :projects, :project_type, :integer
+  end
+
+  def self.down
+    remove_column :projects, :project_type
+  end
+end
diff --git a/db/migrate/20130831080808_create_teachers.rb b/db/migrate/20130831080808_create_teachers.rb
new file mode 100644
index 000000000..ce3d5f92c
--- /dev/null
+++ b/db/migrate/20130831080808_create_teachers.rb
@@ -0,0 +1,12 @@
+class CreateTeachers < ActiveRecord::Migration
+  def change
+    create_table :teachers do |t|
+      t.string :tea_name
+      t.string :location
+      t.integer :couurse_time
+      t.integer :course_code
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20130831080955_add_extra_to_teacher.rb b/db/migrate/20130831080955_add_extra_to_teacher.rb
new file mode 100644
index 000000000..1de12802c
--- /dev/null
+++ b/db/migrate/20130831080955_add_extra_to_teacher.rb
@@ -0,0 +1,5 @@
+class AddExtraToTeacher < ActiveRecord::Migration
+  def change
+    add_column :teachers, :extra, :string
+  end
+end
diff --git a/db/migrate/20130904075504_create_courses.rb b/db/migrate/20130904075504_create_courses.rb
new file mode 100644
index 000000000..682892696
--- /dev/null
+++ b/db/migrate/20130904075504_create_courses.rb
@@ -0,0 +1,14 @@
+class CreateCourses < ActiveRecord::Migration
+  def change
+    create_table :courses do |t|
+      t.integer :tea_id
+      t.string :name
+      t.integer :state
+      t.string :code
+      t.integer :time
+      t.string :extra
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20130906124330_add_location_to_course.rb b/db/migrate/20130906124330_add_location_to_course.rb
new file mode 100644
index 000000000..bcf3bccac
--- /dev/null
+++ b/db/migrate/20130906124330_add_location_to_course.rb
@@ -0,0 +1,5 @@
+class AddLocationToCourse < ActiveRecord::Migration
+  def change
+    add_column :courses, :location, :string
+  end
+end
diff --git a/db/migrate/20130910075221_create_homework_for_courses.rb b/db/migrate/20130910075221_create_homework_for_courses.rb
new file mode 100644
index 000000000..429f6bee8
--- /dev/null
+++ b/db/migrate/20130910075221_create_homework_for_courses.rb
@@ -0,0 +1,8 @@
+class CreateHomeworkForCourses < ActiveRecord::Migration
+  def change
+    create_table :homework_for_courses do |t|
+      t.integer :project_id
+      t.integer :bid_id
+    end
+  end
+end
diff --git a/db/migrate/20130911005626_create_students_for_courses.rb b/db/migrate/20130911005626_create_students_for_courses.rb
new file mode 100644
index 000000000..5e7f3a8a7
--- /dev/null
+++ b/db/migrate/20130911005626_create_students_for_courses.rb
@@ -0,0 +1,10 @@
+class CreateStudentsForCourses < ActiveRecord::Migration
+  def change
+    create_table :students_for_courses do |t|
+      t.integer :student_id
+      t.integer :course_id
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20130913005337_add_homework_type_to_bid.rb b/db/migrate/20130913005337_add_homework_type_to_bid.rb
new file mode 100644
index 000000000..64a0d4cb7
--- /dev/null
+++ b/db/migrate/20130913005337_add_homework_type_to_bid.rb
@@ -0,0 +1,5 @@
+class AddHomeworkTypeToBid < ActiveRecord::Migration
+  def change
+    add_column :bids, :homework_type, :integer
+  end
+end
diff --git a/db/migrate/20130913125835_create_homework_attaches.rb b/db/migrate/20130913125835_create_homework_attaches.rb
new file mode 100644
index 000000000..2caea7166
--- /dev/null
+++ b/db/migrate/20130913125835_create_homework_attaches.rb
@@ -0,0 +1,10 @@
+class CreateHomeworkAttaches < ActiveRecord::Migration
+  def change
+    create_table :homework_attaches do |t|
+      t.integer :bid_id
+      t.integer :user_id
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20130917123036_add_term_to_courses.rb b/db/migrate/20130917123036_add_term_to_courses.rb
new file mode 100644
index 000000000..3f7f7ef30
--- /dev/null
+++ b/db/migrate/20130917123036_add_term_to_courses.rb
@@ -0,0 +1,6 @@
+class AddTermToCourses < ActiveRecord::Migration
+  def change
+    add_column :courses, :term, :string
+    add_column :courses, :string, :string
+  end
+end
diff --git a/db/migrate/20130918004629_add_technical_title_to_user_extensions.rb b/db/migrate/20130918004629_add_technical_title_to_user_extensions.rb
new file mode 100644
index 000000000..7097e6aee
--- /dev/null
+++ b/db/migrate/20130918004629_add_technical_title_to_user_extensions.rb
@@ -0,0 +1,5 @@
+class AddTechnicalTitleToUserExtensions < ActiveRecord::Migration
+  def change
+    add_column :user_extensions, :technical_title, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a6452cbba..2ec42eb44 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -13,14 +13,6 @@
 
 ActiveRecord::Schema.define(:version => 20130922123849) do
 
-  create_table "a_user_watchers", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "member_id"
-  end
-
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
     t.string  "act_type", :null => false
@@ -284,9 +276,9 @@ ActiveRecord::Schema.define(:version => 20130922123849) do
   add_index "issue_categories", ["project_id"], :name => "issue_categories_project_id"
 
   create_table "issue_relations", :force => true do |t|
-    t.integer "issue_from_id", :null => false
-    t.integer "issue_to_id",   :null => false
-    t.string  "relation_type", :null => false
+    t.integer "issue_from_id",                 :null => false
+    t.integer "issue_to_id",                   :null => false
+    t.string  "relation_type", :default => "", :null => false
     t.integer "delay"
   end
 
@@ -428,22 +420,6 @@ ActiveRecord::Schema.define(:version => 20130922123849) do
   add_index "messages", ["last_reply_id"], :name => "index_messages_on_last_reply_id"
   add_index "messages", ["parent_id"], :name => "messages_parent_id"
 
-  create_table "messages_for_bids", :force => true do |t|
-    t.string   "message"
-    t.integer  "user_id"
-    t.integer  "bid_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "messages_for_users", :force => true do |t|
-    t.integer  "messager_id"
-    t.integer  "user_id"
-    t.string   "message"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
   create_table "news", :force => true do |t|
     t.integer  "project_id"
     t.string   "title",          :limit => 60, :default => "", :null => false
@@ -583,6 +559,26 @@ ActiveRecord::Schema.define(:version => 20130922123849) do
     t.string  "issues_visibility", :limit => 30, :default => "default", :null => false
   end
 
+  create_table "seems_rateable_cached_ratings", :force => true do |t|
+    t.integer  "cacheable_id",   :limit => 8
+    t.string   "cacheable_type"
+    t.float    "avg",                         :null => false
+    t.integer  "cnt",                         :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                  :null => false
+    t.datetime "updated_at",                  :null => false
+  end
+
+  create_table "seems_rateable_rates", :force => true do |t|
+    t.integer  "rater_id",      :limit => 8
+    t.integer  "rateable_id"
+    t.string   "rateable_type"
+    t.float    "stars",                      :null => false
+    t.string   "dimension"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
+  end
+
   create_table "settings", :force => true do |t|
     t.string   "name",       :default => "", :null => false
     t.text     "value"
@@ -593,9 +589,9 @@ ActiveRecord::Schema.define(:version => 20130922123849) do
 
   create_table "shares", :force => true do |t|
     t.date     "created_on"
-    t.string   "title"
-    t.string   "share_type"
     t.string   "url"
+    t.string   "title"
+    t.integer  "share_type"
     t.datetime "created_at",  :null => false
     t.datetime "updated_at",  :null => false
     t.integer  "project_id"
@@ -603,8 +599,9 @@ ActiveRecord::Schema.define(:version => 20130922123849) do
     t.string   "description"
   end
 
-  create_table "students", :force => true do |t|
-    t.string   "name"
+  create_table "students_for_courses", :force => true do |t|
+    t.integer  "student_id"
+    t.integer  "course_id"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end
@@ -667,7 +664,7 @@ ActiveRecord::Schema.define(:version => 20130922123849) do
   create_table "tokens", :force => true do |t|
     t.integer  "user_id",                  :default => 0,  :null => false
     t.string   "action",     :limit => 30, :default => "", :null => false
-    t.string   "value",      :limit => 40
+    t.string   "value",      :limit => 40, :default => "", :null => false
     t.datetime "created_on",                               :null => false
   end
 
@@ -722,12 +719,13 @@ ActiveRecord::Schema.define(:version => 20130922123849) do
 
   create_table "user_tags", :force => true do |t|
     t.integer  "user_id"
-    t.integer  "tag_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
   end
 
+  add_index "user_statuses", ["changesets_count"], :name => "index_user_statuses_on_changesets_count"
+  add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
+
   create_table "users", :force => true do |t|
     t.string   "login",                           :default => "",    :null => false
     t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
diff --git a/files/2013/08/130806152654_desktop.ini b/files/2013/08/130806152654_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806152654_desktop.ini differ
diff --git a/files/2013/08/130806153250_desktop.ini b/files/2013/08/130806153250_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806153250_desktop.ini differ
diff --git a/files/2013/08/130806153331_desktop.ini b/files/2013/08/130806153331_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806153331_desktop.ini differ
diff --git a/files/2013/08/130806153435_desktop.ini b/files/2013/08/130806153435_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806153435_desktop.ini differ
diff --git a/files/2013/08/130806153511_desktop.ini b/files/2013/08/130806153511_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806153511_desktop.ini differ
diff --git a/files/2013/08/130806153649_desktop.ini b/files/2013/08/130806153649_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806153649_desktop.ini differ
diff --git a/files/2013/08/130806153715_desktop.ini b/files/2013/08/130806153715_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806153715_desktop.ini differ
diff --git a/files/2013/08/130806153855_desktop.ini b/files/2013/08/130806153855_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806153855_desktop.ini differ
diff --git a/files/2013/08/130806153935_desktop.ini b/files/2013/08/130806153935_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806153935_desktop.ini differ
diff --git a/files/2013/08/130806154013_desktop.ini b/files/2013/08/130806154013_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806154013_desktop.ini differ
diff --git a/files/2013/08/130806154103_desktop.ini b/files/2013/08/130806154103_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806154103_desktop.ini differ
diff --git a/files/2013/08/130806154135_desktop.ini b/files/2013/08/130806154135_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806154135_desktop.ini differ
diff --git a/files/2013/08/130806154627_desktop.ini b/files/2013/08/130806154627_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806154627_desktop.ini differ
diff --git a/files/2013/08/130806154720_desktop.ini b/files/2013/08/130806154720_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806154720_desktop.ini differ
diff --git a/files/2013/08/130806154826_desktop.ini b/files/2013/08/130806154826_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806154826_desktop.ini differ
diff --git a/files/2013/08/130806154843_desktop.ini b/files/2013/08/130806154843_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806154843_desktop.ini differ
diff --git a/files/2013/08/130806154858_desktop.ini b/files/2013/08/130806154858_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806154858_desktop.ini differ
diff --git a/files/2013/08/130806155359_desktop.ini b/files/2013/08/130806155359_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806155359_desktop.ini differ
diff --git a/files/2013/08/130806155534_desktop.ini b/files/2013/08/130806155534_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806155534_desktop.ini differ
diff --git a/files/2013/08/130806155622_desktop.ini b/files/2013/08/130806155622_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806155622_desktop.ini differ
diff --git a/files/2013/08/130806155745_desktop.ini b/files/2013/08/130806155745_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806155745_desktop.ini differ
diff --git a/files/2013/08/130806155911_desktop.ini b/files/2013/08/130806155911_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806155911_desktop.ini differ
diff --git a/files/2013/08/130806160031_desktop.ini b/files/2013/08/130806160031_desktop.ini
new file mode 100644
index 000000000..d5d42888f
Binary files /dev/null and b/files/2013/08/130806160031_desktop.ini differ
diff --git a/files/2013/08/130807094116_Chrysanthemum.jpg b/files/2013/08/130807094116_Chrysanthemum.jpg
new file mode 100644
index 000000000..757c2a628
Binary files /dev/null and b/files/2013/08/130807094116_Chrysanthemum.jpg differ
diff --git a/files/2013/08/130807094539_Jellyfish.jpg b/files/2013/08/130807094539_Jellyfish.jpg
new file mode 100644
index 000000000..fa4fd4110
Binary files /dev/null and b/files/2013/08/130807094539_Jellyfish.jpg differ
diff --git a/files/2013/08/130827170642_1675b2d45e868443acb3447a529c1ace.txt b/files/2013/08/130827170642_1675b2d45e868443acb3447a529c1ace.txt
new file mode 100644
index 000000000..0faa795e7
--- /dev/null
+++ b/files/2013/08/130827170642_1675b2d45e868443acb3447a529c1ace.txt
@@ -0,0 +1,4 @@
+�ͻ�������ϵͳ��Ubuntu Linux��64λ��
+������汾��8
+Cpu��2vcpu
+�ڴ棺4196MB
diff --git a/files/2013/08/130829095300_1675b2d45e868443acb3447a529c1ace.txt b/files/2013/08/130829095300_1675b2d45e868443acb3447a529c1ace.txt
new file mode 100644
index 000000000..0faa795e7
--- /dev/null
+++ b/files/2013/08/130829095300_1675b2d45e868443acb3447a529c1ace.txt
@@ -0,0 +1,4 @@
+�ͻ�������ϵͳ��Ubuntu Linux��64λ��
+������汾��8
+Cpu��2vcpu
+�ڴ棺4196MB
diff --git a/files/2013/09/130909091918_twurn.com_.png b/files/2013/09/130909091918_twurn.com_.png
new file mode 100644
index 000000000..2e8198241
Binary files /dev/null and b/files/2013/09/130909091918_twurn.com_.png differ
diff --git a/files/2013/09/130909102300_twurn.com_.png b/files/2013/09/130909102300_twurn.com_.png
new file mode 100644
index 000000000..2e8198241
Binary files /dev/null and b/files/2013/09/130909102300_twurn.com_.png differ
diff --git a/files/2013/09/130909102607_48a3823e1ee72a1a06a62cbdcb4a5cd0.txt b/files/2013/09/130909102607_48a3823e1ee72a1a06a62cbdcb4a5cd0.txt
new file mode 100644
index 000000000..4eeb9c90d
--- /dev/null
+++ b/files/2013/09/130909102607_48a3823e1ee72a1a06a62cbdcb4a5cd0.txt
@@ -0,0 +1,7 @@
+<!-- add by huang -->
+		<% if(@project.project_type)%>
+			<%= content_tag('span', "#{l(:field_tea_name)}: ") %>
+		<% else %>
+			<%= content_tag('span', "#{l(:default_role_manager)}: ") %>
+		<% end %>
+		<!-- end  -->
\ No newline at end of file
diff --git a/files/2013/09/130913110338_YodaoDict.exe b/files/2013/09/130913110338_YodaoDict.exe
new file mode 100644
index 000000000..cb0fb4658
Binary files /dev/null and b/files/2013/09/130913110338_YodaoDict.exe differ
diff --git a/files/2013/09/130913112844_YodaoDict.exe b/files/2013/09/130913112844_YodaoDict.exe
new file mode 100644
index 000000000..cb0fb4658
Binary files /dev/null and b/files/2013/09/130913112844_YodaoDict.exe differ
diff --git a/files/2013/09/130913150242_YodaoDict.exe b/files/2013/09/130913150242_YodaoDict.exe
new file mode 100644
index 000000000..cb0fb4658
Binary files /dev/null and b/files/2013/09/130913150242_YodaoDict.exe differ
diff --git a/files/2013/09/130913150350_89d0a4acf8770fc08309561559c49b62.exe b/files/2013/09/130913150350_89d0a4acf8770fc08309561559c49b62.exe
new file mode 100644
index 000000000..6b17f167a
Binary files /dev/null and b/files/2013/09/130913150350_89d0a4acf8770fc08309561559c49b62.exe differ
diff --git a/files/2013/09/130913152235_XMP.exe b/files/2013/09/130913152235_XMP.exe
new file mode 100644
index 000000000..bf062e124
Binary files /dev/null and b/files/2013/09/130913152235_XMP.exe differ
diff --git a/files/2013/09/130913152553_d53d97d93a897698e1b597ba567568fe.exe b/files/2013/09/130913152553_d53d97d93a897698e1b597ba567568fe.exe
new file mode 100644
index 000000000..6231c923e
Binary files /dev/null and b/files/2013/09/130913152553_d53d97d93a897698e1b597ba567568fe.exe differ
diff --git a/files/2013/09/130913152811_XMP.exe b/files/2013/09/130913152811_XMP.exe
new file mode 100644
index 000000000..bf062e124
Binary files /dev/null and b/files/2013/09/130913152811_XMP.exe differ
diff --git a/files/2013/09/130913205349_XMP.exe b/files/2013/09/130913205349_XMP.exe
new file mode 100644
index 000000000..bf062e124
Binary files /dev/null and b/files/2013/09/130913205349_XMP.exe differ
diff --git a/files/2013/09/130913211043_d53d97d93a897698e1b597ba567568fe.exe b/files/2013/09/130913211043_d53d97d93a897698e1b597ba567568fe.exe
new file mode 100644
index 000000000..6231c923e
Binary files /dev/null and b/files/2013/09/130913211043_d53d97d93a897698e1b597ba567568fe.exe differ
diff --git a/files/2013/09/130913211313_navicat.exe b/files/2013/09/130913211313_navicat.exe
new file mode 100644
index 000000000..cde21f595
Binary files /dev/null and b/files/2013/09/130913211313_navicat.exe differ
diff --git a/files/2013/09/130913214441_89d0a4acf8770fc08309561559c49b62.exe b/files/2013/09/130913214441_89d0a4acf8770fc08309561559c49b62.exe
new file mode 100644
index 000000000..6b17f167a
Binary files /dev/null and b/files/2013/09/130913214441_89d0a4acf8770fc08309561559c49b62.exe differ
diff --git a/files/2013/09/130913214715_navicat.exe b/files/2013/09/130913214715_navicat.exe
new file mode 100644
index 000000000..cde21f595
Binary files /dev/null and b/files/2013/09/130913214715_navicat.exe differ
diff --git a/files/2013/09/130913214952_YodaoDict.exe b/files/2013/09/130913214952_YodaoDict.exe
new file mode 100644
index 000000000..cb0fb4658
Binary files /dev/null and b/files/2013/09/130913214952_YodaoDict.exe differ
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 8da5b5336..96cca91b2 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -218,11 +218,18 @@ end
 Redmine::MenuManager.map :bid_menu do |menu|
   menu.push :respond, { :controller => 'bids', :action => 'show' }, :caption => :label_user_response
   menu.push :project, { :controller => 'bids', :action => 'show_project' }, :caption => :label_bidding_project
+  # menu.push :homework_respond, {:controller => 'bids', :action => 'homework_respond'}
 end
 Redmine::MenuManager.map :application_menu do |menu|
   # Empty
 end
 
+######
+Redmine::MenuManager.map :homework_menu do |menu|
+  menu.push :respond, { :controller => 'bids', :action => 'show' }, :caption => :label_homework_response
+  menu.push :project, { :controller => 'bids', :action => 'show_project' }, :caption => :label_bidding_homework
+end
+########end
 Redmine::MenuManager.map :admin_menu do |menu|
   menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
   menu.push :users, {:controller => 'users'}, :caption => :label_user_plural
@@ -241,7 +248,7 @@ Redmine::MenuManager.map :admin_menu do |menu|
   menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true
   menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true
 end
-#by young
+#Modified by young
 Redmine::MenuManager.map :project_menu do |menu|
   menu.push :overview, { :controller => 'projects', :action => 'show' }
 #  menu.push :activity, { :controller => 'activities', :action => 'index' }
@@ -265,10 +272,22 @@ Redmine::MenuManager.map :project_menu do |menu|
   
 end
 #end
+
 #added by young
+Redmine::MenuManager.map :course_menu do |menu|
+  menu.push :overview, { :controller => 'projects', :action => 'show'}
+  menu.push :homework, { :controller => 'projects', :action => 'homework' }
+#  menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
+#  menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_new, :param => :project_id
+  menu.push :repository, { :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil, :course => 1 }     
+  menu.push :settings, { :controller => 'projects', :action => 'settings', :course => 1 }, :last => true
+  
+end
 Redmine::MenuManager.map :user_menu do |menu|
   menu.push :activity, {:controller => 'users', :action => 'show' }
+  menu.push :user_course, {:controller => 'users', :action => 'user_courses'}
   menu.push :user_project, {:controller => 'users', :action => 'user_projects'}
+  
   menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids'}
   menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback'}
   
diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index 25974ed83..887c3a4b7 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -74,10 +74,11 @@ module Redmine
       def current_menu_item
         controller.current_menu_item
       end
+      
 
       # Renders the application main menu
       def render_main_menu(project)
-        render_menu((project && !project.new_record?) ? :project_menu : :application_menu, project)
+          render_menu((project && !project.new_record?) ? :project_menu : :application_menu, project)
       end
 
       def display_main_menu?(project)
diff --git a/public/images/avatars/Project/6316 b/public/images/avatars/Project/6316
new file mode 100644
index 000000000..fa4fd4110
Binary files /dev/null and b/public/images/avatars/Project/6316 differ
diff --git a/public/images/avatars/Project/6356 b/public/images/avatars/Project/6356
new file mode 100644
index 000000000..757c2a628
Binary files /dev/null and b/public/images/avatars/Project/6356 differ
diff --git a/public/images/avatars/Project/6358 b/public/images/avatars/Project/6358
new file mode 100644
index 000000000..030ab8a68
Binary files /dev/null and b/public/images/avatars/Project/6358 differ
diff --git a/public/images/avatars/Project/6446 b/public/images/avatars/Project/6446
new file mode 100644
index 000000000..90e0e8474
Binary files /dev/null and b/public/images/avatars/Project/6446 differ
diff --git a/public/statistics/trustie2/arrow-down.gif b/public/statistics/trustie2/arrow-down.gif
new file mode 100644
index 000000000..997f02f6b
Binary files /dev/null and b/public/statistics/trustie2/arrow-down.gif differ
diff --git a/public/statistics/trustie2/arrow-none.gif b/public/statistics/trustie2/arrow-none.gif
new file mode 100644
index 000000000..d011a4999
Binary files /dev/null and b/public/statistics/trustie2/arrow-none.gif differ
diff --git a/public/statistics/trustie2/arrow-up.gif b/public/statistics/trustie2/arrow-up.gif
new file mode 100644
index 000000000..15eabb351
Binary files /dev/null and b/public/statistics/trustie2/arrow-up.gif differ
diff --git a/public/statistics/trustie2/gitstats.cache b/public/statistics/trustie2/gitstats.cache
new file mode 100644
index 000000000..82669a176
Binary files /dev/null and b/public/statistics/trustie2/gitstats.cache differ
diff --git a/public/statistics/trustie2/gitstats.css b/public/statistics/trustie2/gitstats.css
new file mode 100644
index 000000000..2e401fe1f
--- /dev/null
+++ b/public/statistics/trustie2/gitstats.css
@@ -0,0 +1,154 @@
+/**
+ * GitStats - default style
+ */
+body {
+	color: black;
+	background-color: #fff;
+}
+
+dt {
+	font-size: 12px;
+	font-weight: bold;
+	float: left;
+	margin-right: 1em;
+	margin-left: 10px;
+}
+
+dt:after {
+	content: ': ';
+}
+
+dd {
+	font-size: 11px;
+	display: block;
+	clear: left;
+}
+
+table {
+	border: 1px solid black;
+	border-collapse: collapse;
+	font-size: 70%;
+	margin-bottom: 1em;
+}
+
+table.noborders {
+	border: none;
+}
+
+table.noborders td {
+	border: none;
+}
+
+.vtable {
+	float: right;
+	clear: both;
+}
+
+table.tags td {
+	vertical-align: top;
+}
+
+th {
+	background-color: #ddf;
+}
+
+th a {
+	text-decoration: none;
+}
+
+tr:hover {
+	background-color: #ddf;
+}
+
+td {
+	border: 1px solid black;
+	padding: 0.2em;
+	padding-left: 0.3em;
+	padding-right: 0.2em;
+}
+
+/* Navigation bar; tabbed style */
+.nav {
+	height: 2em; margin-bottom:1.2em; position:relative; overflow:hidden;margin-top: -10px;
+}
+
+.nav ul {
+	margin:0; position:absolute; bottom:0; padding-left:0.5em;
+}
+
+.nav li {
+	float:left;
+  	list-style-type:none;
+  	white-space:nowrap;
+  	margin-right:0px;
+  	background:#fff;
+  	position:relative;
+  	margin-bottom:5px;
+}
+
+.nav li a {
+	font-size: 0.8em;
+  	text-decoration:none;
+  	line-height:1.3em;
+ 	padding:2px 6px 2px 6px;
+  	border: 1px solid #ccc;
+  	border-bottom: 1px solid #bbbbbb;
+  	background-color:#FFFFFF;
+  	color:#999;
+  	font-weight:bold;
+  	border-top-left-radius:3px;
+  	border-top-right-radius:3px;
+}
+
+.nav li a:hover {
+	background-color: #cacbcb;
+  	text-decoration:none;
+}
+
+img {
+	border: 1px solid black;
+	padding: 0.5em;
+	background-color: white;
+}
+
+th img {
+	border: 0px;
+	padding: 0px;
+	background-color: #ddf;
+}
+
+h1 a, h2 a {
+	color: black;
+	text-decoration: none;
+}
+
+h1:hover a:after,
+h2:hover a:after {
+	color: #555;
+}
+
+h1 {
+	font-size: x-large;
+}
+
+h2 {
+	background-color: #C6E9F1;
+	border: 1px solid #C6E9F1;
+	padding-left: 0.5em;
+	padding-right: 0.5em;
+	color: black;
+	font-size: 0.8em;
+	clear: both;
+}
+
+h2 a {
+	color: black;
+}
+
+p{
+	font-size: 0.7em;
+}
+
+.moreauthors {
+	font-size: 70%;
+}
diff --git a/public/statistics/trustie2/index.html b/public/statistics/trustie2/index.html
new file mode 100644
index 000000000..950f664bc
--- /dev/null
+++ b/public/statistics/trustie2/index.html
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<!--<title>GitStats - trustie2</title>-->
+	<link rel="stylesheet" href="gitstats.css" type="text/css" />
+	<meta name="generator" content="GitStats " />
+	<script type="text/javascript" src="sortable.js"></script>
+</head>
+<body>
+
+<h2>项目信息(Project Information)</h2>
+<dl><dt>项目名(Project name)</dt><dd>trustie2</dd><dt>统计时段(Report Period)</dt><dd>2013-08-01 02:33:49 to 2013-08-23 22:41:30</dd><dt>项目活跃时段(Project Active Period)</dt><dd>2013-08-01 02:33:49 to 2013-08-09 09:24:38 (9 days)</dd>
+<h2><a href="#代码文件信息(files_information_of_code)" name="代码文件信息(files_information_of_code)">代码文件信息(Files Information of Code)</a></h2>
+
+<table class="authors sortable" id="ext"><tr><th>文件类型(File Type)</th><th>文件数(Files Number)</th><th>代码行数(Lines Number of Code)</th></tr><tr><td>.rb</td><td>677</td><td>59777</td></tr><tr><td>.erb</td><td>423</td><td>10688</td></tr><tr><td>.js</td><td>109</td><td>3891</td></tr><tr><td>.yml</td><td>77</td><td>52743</td></tr><tr><td>.css</td><td>23</td><td>5820</td></tr><tr><td>.py</td><td>1</td><td>196</td></tr><tr><td>.c</td><td>0</td><td>0</td></tr><tr><td>.html</td><td>5</td><td>334</td></tr><tr><td>.php</td><td>2</td><td>700</td></tr></table><dt>代码文件总数(Total files number of Code)</dt><dd>1317</dd><dt>代码总数(Total Lines number of Code)</dt><dd>134149</dd><dt>修改代码总数(Total Modified Lines Number of Code)</dt><dd>3197 (5961 added, 2764 removed)</dd>
+<h2><a href="#作者信息(authors_information)" name="作者信息(authors_information)">作者信息(Authors Information)</a></h2>
+
+<table class="authors sortable" id="authors"><tr><th>作者名(Author Name)</th><th>提交次数及占百分比(Commits)(%)</th><th>增加代码行数(+ lines)</th><th>删除代码行数(- lines)</th><th>首次提交日期(First commit)</th><th>最后一次提交日期(Last commit)</th><th class="unsortable">活跃年龄(Age)</th><th>活跃天数(Active days)</th><th>#提交排名(# by commits)</th></tr><tr><td>zhangyang</td><td>27 (26.73%)</td><td>653</td><td>359</td><td>2013-08-01</td><td>2013-08-07</td><td>6 days, 2:35:42</td><td>7</td><td>1</td></tr><tr><td>huangjingquan</td><td>21 (20.79%)</td><td>838</td><td>508</td><td>2013-08-01</td><td>2013-08-09</td><td>8 days, 4:34:48</td><td>8</td><td>2</td></tr><tr><td>nieguanghui</td><td>20 (19.80%)</td><td>1169</td><td>568</td><td>2013-08-01</td><td>2013-08-09</td><td>7 days, 21:52:06</td><td>7</td><td>3</td></tr><tr><td>fanqiang</td><td>17 (16.83%)</td><td>2467</td><td>1595</td><td>2013-08-01</td><td>2013-08-09</td><td>7 days, 20:37:38</td><td>9</td><td>4</td></tr><tr><td>william</td><td>9 (8.91%)</td><td>1614</td><td>169</td><td>2013-08-01</td><td>2013-08-08</td><td>7 days, 1:46:54</td><td>4</td><td>5</td></tr><tr><td>kaizheng</td><td>6 (5.94%)</td><td>809</td><td>68</td><td>2013-08-01</td><td>2013-08-09</td><td>7 days, 20:04:01</td><td>4</td><td>6</td></tr><tr><td>wanglinchun</td><td>1 (0.99%)</td><td>7</td><td>4</td><td>2013-08-07</td><td>2013-08-07</td><td>0:00:00</td><td>1</td><td>7</td></tr></table><dt>作者总数(Authors Number)</dt><dd>7</dd><dt>提交总数(Total Commits Number)</dt><dd>101 (average 11.2 commits per active day, 11.2 per all days)</dd></dl></body>
+</html>
\ No newline at end of file
diff --git a/public/statistics/trustie2/sortable.js b/public/statistics/trustie2/sortable.js
new file mode 100644
index 000000000..89477324a
--- /dev/null
+++ b/public/statistics/trustie2/sortable.js
@@ -0,0 +1,324 @@
+/*
+Table sorting script  by Joost de Valk, check it out at http://www.joostdevalk.nl/code/sortable-table/.
+Based on a script from http://www.kryogenix.org/code/browser/sorttable/.
+Distributed under the MIT license: http://www.kryogenix.org/code/browser/licence.html .
+
+Copyright (c) 1997-2007 Stuart Langridge, Joost de Valk.
+
+Version 1.5.7
+*/
+
+/* You can change these values */
+var image_path = "";
+var image_up = "arrow-up.gif";
+var image_down = "arrow-down.gif";
+var image_none = "arrow-none.gif";
+var europeandate = true;
+var alternate_row_colors = true;
+
+/* Don't change anything below this unless you know what you're doing */
+addEvent(window, "load", sortables_init);
+
+var SORT_COLUMN_INDEX;
+var thead = false;
+
+function sortables_init() {
+	// Find all tables with class sortable and make them sortable
+	if (!document.getElementsByTagName) return;
+	tbls = document.getElementsByTagName("table");
+	for (ti=0;ti<tbls.length;ti++) {
+		thisTbl = tbls[ti];
+		if (((' '+thisTbl.className+' ').indexOf("sortable") != -1) && (thisTbl.id)) {
+			ts_makeSortable(thisTbl);
+		}
+	}
+}
+
+function ts_makeSortable(t) {
+	if (t.rows && t.rows.length > 0) {
+		if (t.tHead && t.tHead.rows.length > 0) {
+			var firstRow = t.tHead.rows[t.tHead.rows.length-1];
+			thead = true;
+		} else {
+			var firstRow = t.rows[0];
+		}
+	}
+	if (!firstRow) return;
+	
+	// We have a first row: assume it's the header, and make its contents clickable links
+	for (var i=0;i<firstRow.cells.length;i++) {
+		var cell = firstRow.cells[i];
+		var txt = ts_getInnerText(cell);
+		if (cell.className != "unsortable" && cell.className.indexOf("unsortable") == -1) {
+			cell.innerHTML = '<a href="#" class="sortheader" onclick="ts_resortTable(this, '+i+');return false;">'+txt+'<span class="sortarrow">&nbsp;&nbsp;<img src="'+ image_path + image_none + '" alt="&darr;"/></span></a>';
+		}
+	}
+	if (alternate_row_colors) {
+		alternate(t);
+	}
+}
+
+function ts_getInnerText(el) {
+	if (typeof el == "string") return el;
+	if (typeof el == "undefined") { return el };
+	if (el.innerText) return el.innerText;	//Not needed but it is faster
+	var str = "";
+	
+	var cs = el.childNodes;
+	var l = cs.length;
+	for (var i = 0; i < l; i++) {
+		switch (cs[i].nodeType) {
+			case 1: //ELEMENT_NODE
+				str += ts_getInnerText(cs[i]);
+				break;
+			case 3:	//TEXT_NODE
+				str += cs[i].nodeValue;
+				break;
+		}
+	}
+	return str;
+}
+
+function ts_resortTable(lnk, clid) {
+	var span;
+	for (var ci=0;ci<lnk.childNodes.length;ci++) {
+		if (lnk.childNodes[ci].tagName && lnk.childNodes[ci].tagName.toLowerCase() == 'span') span = lnk.childNodes[ci];
+	}
+	var spantext = ts_getInnerText(span);
+	var td = lnk.parentNode;
+	var column = clid || td.cellIndex;
+	var t = getParent(td,'TABLE');
+	// Work out a type for the column
+	if (t.rows.length <= 1) return;
+	var itm = "";
+	var i = 1;
+	while (itm == "" && i < t.tBodies[0].rows.length) {
+		var itm = ts_getInnerText(t.tBodies[0].rows[i].cells[column]);
+		itm = trim(itm);
+		if (itm.substr(0,4) == "<!--" || itm.length == 0) {
+			itm = "";
+		}
+		i++;
+	}
+	if (itm == "") return; 
+	sortfn = ts_sort_caseinsensitive;
+	if (itm.match(/^\d\d[\/\.-][a-zA-z][a-zA-Z][a-zA-Z][\/\.-]\d\d\d\d$/)) sortfn = ts_sort_date;
+	if (itm.match(/^\d\d[\/\.-]\d\d[\/\.-]\d\d\d{2}?$/)) sortfn = ts_sort_date;
+	if (itm.match(/^-?[�$�ۢ�]\d/)) sortfn = ts_sort_numeric;
+	// ignore stuff in () after the numbers.
+	if (itm.match(/^-?(\d+[,\.]?)+(E[-+][\d]+)?%?( \(.*\))?$/)) sortfn = ts_sort_numeric;
+	SORT_COLUMN_INDEX = column;
+	var firstRow = new Array();
+	var newRows = new Array();
+	for (k=0;k<t.tBodies.length;k++) {
+		for (i=0;i<t.tBodies[k].rows[0].length;i++) { 
+			firstRow[i] = t.tBodies[k].rows[0][i]; 
+		}
+	}
+	for (k=0;k<t.tBodies.length;k++) {
+		if (!thead) {
+			// Skip the first row
+			for (j=1;j<t.tBodies[k].rows.length;j++) { 
+				newRows[j-1] = t.tBodies[k].rows[j];
+			}
+		} else {
+			// Do NOT skip the first row
+			for (j=0;j<t.tBodies[k].rows.length;j++) { 
+				newRows[j] = t.tBodies[k].rows[j];
+			}
+		}
+	}
+	newRows.sort(sortfn);
+	if (span.getAttribute("sortdir") == 'down') {
+			ARROW = '&nbsp;&nbsp;<img src="'+ image_path + image_down + '" alt="&darr;"/>';
+			newRows.reverse();
+			span.setAttribute('sortdir','up');
+	} else {
+			ARROW = '&nbsp;&nbsp;<img src="'+ image_path + image_up + '" alt="&uarr;"/>';
+			span.setAttribute('sortdir','down');
+	} 
+    // We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones
+    // don't do sortbottom rows
+    for (i=0; i<newRows.length; i++) { 
+		if (!newRows[i].className || (newRows[i].className && (newRows[i].className.indexOf('sortbottom') == -1))) {
+			t.tBodies[0].appendChild(newRows[i]);
+		}
+	}
+    // do sortbottom rows only
+    for (i=0; i<newRows.length; i++) {
+		if (newRows[i].className && (newRows[i].className.indexOf('sortbottom') != -1)) 
+			t.tBodies[0].appendChild(newRows[i]);
+	}
+	// Delete any other arrows there may be showing
+	var allspans = document.getElementsByTagName("span");
+	for (var ci=0;ci<allspans.length;ci++) {
+		if (allspans[ci].className == 'sortarrow') {
+			if (getParent(allspans[ci],"table") == getParent(lnk,"table")) { // in the same table as us?
+				allspans[ci].innerHTML = '&nbsp;&nbsp;<img src="'+ image_path + image_none + '" alt="&darr;"/>';
+			}
+		}
+	}		
+	span.innerHTML = ARROW;
+	alternate(t);
+}
+
+function getParent(el, pTagName) {
+	if (el == null) {
+		return null;
+	} else if (el.nodeType == 1 && el.tagName.toLowerCase() == pTagName.toLowerCase()) {
+		return el;
+	} else {
+		return getParent(el.parentNode, pTagName);
+	}
+}
+
+function sort_date(date) {	
+	// y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX
+	dt = "00000000";
+	if (date.length == 11) {
+		mtstr = date.substr(3,3);
+		mtstr = mtstr.toLowerCase();
+		switch(mtstr) {
+			case "jan": var mt = "01"; break;
+			case "feb": var mt = "02"; break;
+			case "mar": var mt = "03"; break;
+			case "apr": var mt = "04"; break;
+			case "may": var mt = "05"; break;
+			case "jun": var mt = "06"; break;
+			case "jul": var mt = "07"; break;
+			case "aug": var mt = "08"; break;
+			case "sep": var mt = "09"; break;
+			case "oct": var mt = "10"; break;
+			case "nov": var mt = "11"; break;
+			case "dec": var mt = "12"; break;
+			// default: var mt = "00";
+		}
+		dt = date.substr(7,4)+mt+date.substr(0,2);
+		return dt;
+	} else if (date.length == 10) {
+		if (europeandate == false) {
+			dt = date.substr(6,4)+date.substr(0,2)+date.substr(3,2);
+			return dt;
+		} else {
+			dt = date.substr(6,4)+date.substr(3,2)+date.substr(0,2);
+			return dt;
+		}
+	} else if (date.length == 8) {
+		yr = date.substr(6,2);
+		if (parseInt(yr) < 50) { 
+			yr = '20'+yr; 
+		} else { 
+			yr = '19'+yr; 
+		}
+		if (europeandate == true) {
+			dt = yr+date.substr(3,2)+date.substr(0,2);
+			return dt;
+		} else {
+			dt = yr+date.substr(0,2)+date.substr(3,2);
+			return dt;
+		}
+	}
+	return dt;
+}
+
+function ts_sort_date(a,b) {
+	dt1 = sort_date(ts_getInnerText(a.cells[SORT_COLUMN_INDEX]));
+	dt2 = sort_date(ts_getInnerText(b.cells[SORT_COLUMN_INDEX]));
+	
+	if (dt1==dt2) {
+		return 0;
+	}
+	if (dt1<dt2) { 
+		return -1;
+	}
+	return 1;
+}
+function ts_sort_numeric(a,b) {
+	var aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
+	aa = clean_num(aa);
+	var bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
+	bb = clean_num(bb);
+	return compare_numeric(aa,bb);
+}
+function compare_numeric(a,b) {
+	var a = parseFloat(a);
+	a = (isNaN(a) ? 0 : a);
+	var b = parseFloat(b);
+	b = (isNaN(b) ? 0 : b);
+	return a - b;
+}
+function ts_sort_caseinsensitive(a,b) {
+	aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]).toLowerCase();
+	bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]).toLowerCase();
+	if (aa==bb) {
+		return 0;
+	}
+	if (aa<bb) {
+		return -1;
+	}
+	return 1;
+}
+function ts_sort_default(a,b) {
+	aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
+	bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
+	if (aa==bb) {
+		return 0;
+	}
+	if (aa<bb) {
+		return -1;
+	}
+	return 1;
+}
+function addEvent(elm, evType, fn, useCapture)
+// addEvent and removeEvent
+// cross-browser event handling for IE5+,	NS6 and Mozilla
+// By Scott Andrew
+{
+	if (elm.addEventListener){
+		elm.addEventListener(evType, fn, useCapture);
+		return true;
+	} else if (elm.attachEvent){
+		var r = elm.attachEvent("on"+evType, fn);
+		return r;
+	} else {
+		alert("Handler could not be removed");
+	}
+}
+function clean_num(str) {
+	str = str.replace(new RegExp(/[^-?0-9.]/g),"");
+	return str;
+}
+function trim(s) {
+	return s.replace(/^\s+|\s+$/g, "");
+}
+function alternate(table) {
+	// Take object table and get all it's tbodies.
+	var tableBodies = table.getElementsByTagName("tbody");
+	// Loop through these tbodies
+	for (var i = 0; i < tableBodies.length; i++) {
+		// Take the tbody, and get all it's rows
+		var tableRows = tableBodies[i].getElementsByTagName("tr");
+		// Loop through these rows
+		// Start at 1 because we want to leave the heading row untouched
+		for (var j = 0; j < tableRows.length; j++) {
+			// Check if j is even, and apply classes for both possible results
+			if ( (j % 2) == 0  ) {
+				if ( !(tableRows[j].className.indexOf('odd') == -1) ) {
+					tableRows[j].className = tableRows[j].className.replace('odd', 'even');
+				} else {
+					if ( tableRows[j].className.indexOf('even') == -1 ) {
+						tableRows[j].className += " even";
+					}
+				}
+			} else {
+				if ( !(tableRows[j].className.indexOf('even') == -1) ) {
+					tableRows[j].className = tableRows[j].className.replace('even', 'odd');
+				} else {
+					if ( tableRows[j].className.indexOf('odd') == -1 ) {
+						tableRows[j].className += " odd";
+					}
+				}
+			} 
+		}
+	}
+}
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index e7de10740..699bca8e5 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -230,6 +230,10 @@ ul.tool li{list-style-type:none;
 	font-size:12px;
 	font-family:微软雅黑;
 }
+.justify_side > span{
+	text-align: justify;
+	width: 180px;
+}
 .font_lighter_sidebar{
 	/*font-family:微软雅黑;*/
 	color:#919294;
@@ -325,7 +329,7 @@ ul.tool li{list-style-type:none;
 .user_tags{
 	padding-top: 5px;
 	padding-bottom: 5px;
-	padding-left: 8px;	
+	padding-left: 12px;	
 }
 
 .tool{
@@ -441,6 +445,10 @@ a.htags{
 	padding: 0px 4px 0px 4px;
 	margin:0 3px;	
 }
+a.logical_int{
+	color: #ed8924;
+}
+
 .contextdescription2{font-family: '微软雅黑';
 				font-size:12px;
 				font-weight:ligher;
@@ -1173,6 +1181,12 @@ ul.properties li span {font-style:italic;}
 
 .total-hours { font-size: 110%; font-weight: bold; }
 .total-hours span.hours-int { font-size: 120%; }
+.gender { width: 20%; }
+/*added by bai 增加了性别、地区和单位的样式 */
+#my_account_form select.gender { width: 20%; }
+#my_account_form select.location {width: 31%;}
+#my_account_form .occupation { width: 56%; }
+/*end*/
 
 /*added by bai 增加了性别、地区和单位的样式 */
 #my_account_form select.gender { width: 20%; }
diff --git a/statistics/trustie2/trustie/activity.html b/statistics/trustie2/trustie/activity.html
new file mode 100644
index 000000000..937bd4b16
--- /dev/null
+++ b/statistics/trustie2/trustie/activity.html
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<!--<title>GitStats - trustie2</title>-->
+	<link rel="stylesheet" href="gitstats.css" type="text/css" />
+	<meta name="generator" content="GitStats " />
+	<script type="text/javascript" src="sortable.js"></script>
+</head>
+<body>
+
+<div class="nav">
+<ul>
+<li><a href="index.html">一般(General)</a></li>
+<li><a href="activity.html">活动(Activity)</a></li>
+<li><a href="authors.html">作者(Authors)</a></li>
+<li><a href="files.html">文件(Files)</a></li>
+<li><a href="tags.html">里程碑(Tags)</a></li>
+</ul>
+</div>
+
+<h2><a href="#周活动(weekly_activity)" name="周活动(weekly_activity)">周活动(Weekly activity)</a></h2>
+
+<p>前24周(Last 24 weeks)</p><table class="noborders"><tr><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">48<div style="display: block; background-color: red; width: 20px; height: 181px"></div></td><td style="text-align: center; vertical-align: bottom">53<div style="display: block; background-color: red; width: 20px; height: 200px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td><td style="text-align: center; vertical-align: bottom">0<div style="display: block; background-color: red; width: 20px; height: 1px"></div></td></tr><tr><td>24</td><td>23</td><td>22</td><td>21</td><td>20</td><td>19</td><td>18</td><td>17</td><td>16</td><td>15</td><td>14</td><td>13</td><td>12</td><td>11</td><td>10</td><td>9</td><td>8</td><td>7</td><td>6</td><td>5</td><td>4</td><td>3</td><td>2</td><td>1</td></tr></table>
+<h2><a href="#每天时统计(hour_of_day)" name="每天时统计(hour_of_day)">每天时统计(Hour of Day)</a></h2>
+
+<table><tr><th>Hour</th><th>0</th><th>1</th><th>2</th><th>3</th><th>4</th><th>5</th><th>6</th><th>7</th><th>8</th><th>9</th><th>10</th><th>11</th><th>12</th><th>13</th><th>14</th><th>15</th><th>16</th><th>17</th><th>18</th><th>19</th><th>20</th><th>21</th><th>22</th><th>23</th></tr>
+<tr><th>Commits</th><td style="background-color: rgb(172, 0, 0)">6</td><td style="background-color: rgb(172, 0, 0)">6</td><td style="background-color: rgb(255, 0, 0)">17</td><td style="background-color: rgb(194, 0, 0)">9</td><td>0</td><td>0</td><td style="background-color: rgb(134, 0, 0)">1</td><td style="background-color: rgb(157, 0, 0)">4</td><td style="background-color: rgb(187, 0, 0)">8</td><td style="background-color: rgb(172, 0, 0)">6</td><td>0</td><td style="background-color: rgb(157, 0, 0)">4</td><td style="background-color: rgb(232, 0, 0)">14</td><td style="background-color: rgb(202, 0, 0)">10</td><td style="background-color: rgb(247, 0, 0)">16</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+<tr><th>%</th><td style="background-color: rgb(172, 0, 0)">5.94</td><td style="background-color: rgb(172, 0, 0)">5.94</td><td style="background-color: rgb(255, 0, 0)">16.83</td><td style="background-color: rgb(194, 0, 0)">8.91</td><td>0.00</td><td>0.00</td><td style="background-color: rgb(134, 0, 0)">0.99</td><td style="background-color: rgb(157, 0, 0)">3.96</td><td style="background-color: rgb(187, 0, 0)">7.92</td><td style="background-color: rgb(172, 0, 0)">5.94</td><td>0.00</td><td style="background-color: rgb(157, 0, 0)">3.96</td><td style="background-color: rgb(232, 0, 0)">13.86</td><td style="background-color: rgb(202, 0, 0)">9.90</td><td style="background-color: rgb(247, 0, 0)">15.84</td><td>0.00</td><td>0.00</td><td>0.00</td><td>0.00</td><td>0.00</td><td>0.00</td><td>0.00</td><td>0.00</td><td>0.00</td></tr></table><img src="hour_of_day.svg" alt="Hour of Day" />
+<h2><a href="#每周天统计(day_of_week)" name="每周天统计(day_of_week)">每周天统计(Day of Week)</a></h2>
+
+<div class="vtable"><table><tr><th>Day</th><th>Total (%)</th></tr><tr><th>1</th><td>4 (3.96%)</td></tr><tr><th>2</th><td>15 (14.85%)</td></tr><tr><th>3</th><td>11 (10.89%)</td></tr><tr><th>4</th><td>34 (33.66%)</td></tr><tr><th>5</th><td>18 (17.82%)</td></tr><tr><th>6</th><td>9 (8.91%)</td></tr><tr><th>7</th><td>10 (9.90%)</td></tr></table></div><img src="day_of_week.svg" alt="Day of Week" />
+<h2><a href="#每周时统计(hour_of_week)" name="每周时统计(hour_of_week)">每周时统计(Hour of Week)</a></h2>
+
+<table><tr><th>Weekday</th><th>0</th><th>1</th><th>2</th><th>3</th><th>4</th><th>5</th><th>6</th><th>7</th><th>8</th><th>9</th><th>10</th><th>11</th><th>12</th><th>13</th><th>14</th><th>15</th><th>16</th><th>17</th><th>18</th><th>19</th><th>20</th><th>21</th><th>22</th><th>23</th></tr><tr><th>1</th><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><th>2</th><td></td><td></td><td style="background-color: rgb(183, 0, 0)">4</td><td></td><td></td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(169, 0, 0)">3</td><td></td><td></td><td></td><td style="background-color: rgb(169, 0, 0)">3</td><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(155, 0, 0)">2</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><th>3</th><td></td><td style="background-color: rgb(155, 0, 0)">2</td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(155, 0, 0)">2</td><td></td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(155, 0, 0)">2</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><th>4</th><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(198, 0, 0)">5</td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td></td><td></td><td></td><td style="background-color: rgb(169, 0, 0)">3</td><td></td><td style="background-color: rgb(169, 0, 0)">3</td><td style="background-color: rgb(255, 0, 0)">9</td><td style="background-color: rgb(198, 0, 0)">5</td><td style="background-color: rgb(226, 0, 0)">7</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><th>5</th><td style="background-color: rgb(169, 0, 0)">3</td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(198, 0, 0)">5</td><td style="background-color: rgb(183, 0, 0)">4</td><td></td><td></td><td></td><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><th>6</th><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(141, 0, 0)">1</td><td style="background-color: rgb(183, 0, 0)">4</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><th>7</th><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(155, 0, 0)">2</td><td style="background-color: rgb(169, 0, 0)">3</td><td style="background-color: rgb(155, 0, 0)">2</td><td></td><td></td><td style="background-color: rgb(141, 0, 0)">1</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr></table>
+<h2><a href="#每年月统计(month_of_year)" name="每年月统计(month_of_year)">每年月统计(Month of Year)</a></h2>
+
+<div class="vtable"><table><tr><th>Month</th><th>Commits (%)</th></tr><tr><td>1</td><td>0 (0.00 %)</td></tr><tr><td>2</td><td>0 (0.00 %)</td></tr><tr><td>3</td><td>0 (0.00 %)</td></tr><tr><td>4</td><td>0 (0.00 %)</td></tr><tr><td>5</td><td>0 (0.00 %)</td></tr><tr><td>6</td><td>0 (0.00 %)</td></tr><tr><td>7</td><td>0 (0.00 %)</td></tr><tr><td>8</td><td>101 (100.00 %)</td></tr><tr><td>9</td><td>0 (0.00 %)</td></tr><tr><td>10</td><td>0 (0.00 %)</td></tr><tr><td>11</td><td>0 (0.00 %)</td></tr><tr><td>12</td><td>0 (0.00 %)</td></tr></table></div><img src="month_of_year.svg" alt="Month of Year" />
+<h2><a href="#提交统计（年/月）commits_by_year/month" name="提交统计（年/月）commits_by_year/month">提交统计（年/月）Commits by year/month</a></h2>
+
+<div class="vtable"><table><tr><th>Month</th><th>Commits</th></tr><tr><td>2013-08</td><td>101</td></tr></table></div><img src="commits_by_year_month.svg" alt="Commits by year/month" />
+<h2><a href="#提交统计（年）(commits_by_year)" name="提交统计（年）(commits_by_year)">提交统计（年）(Commits by Year)</a></h2>
+
+<div class="vtable"><table><tr><th>Year</th><th>Commits (% of all)</th></tr><tr><td>2013</td><td>101 (100.00%)</td></tr></table></div><img src="commits_by_year.svg" alt="Commits by Year" />
+<h2><a href="#提交统计（时区）commits_by_timezone" name="提交统计（时区）commits_by_timezone">提交统计（时区）Commits by Timezone</a></h2>
+
+<table><tr><th>Timezone</th><th>Commits</th><tr><th>+0800</th><td style="background-color: rgb(255, 0, 0)">101</td></tr></tr></table></body></html>
\ No newline at end of file
diff --git a/statistics/trustie2/trustie/arrow-down.gif b/statistics/trustie2/trustie/arrow-down.gif
new file mode 100644
index 000000000..997f02f6b
Binary files /dev/null and b/statistics/trustie2/trustie/arrow-down.gif differ
diff --git a/statistics/trustie2/trustie/arrow-none.gif b/statistics/trustie2/trustie/arrow-none.gif
new file mode 100644
index 000000000..d011a4999
Binary files /dev/null and b/statistics/trustie2/trustie/arrow-none.gif differ
diff --git a/statistics/trustie2/trustie/arrow-up.gif b/statistics/trustie2/trustie/arrow-up.gif
new file mode 100644
index 000000000..15eabb351
Binary files /dev/null and b/statistics/trustie2/trustie/arrow-up.gif differ
diff --git a/statistics/trustie2/trustie/authors.html b/statistics/trustie2/trustie/authors.html
new file mode 100644
index 000000000..b6e2f85f3
--- /dev/null
+++ b/statistics/trustie2/trustie/authors.html
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<!--<title>GitStats - trustie2</title>-->
+	<link rel="stylesheet" href="gitstats.css" type="text/css" />
+	<meta name="generator" content="GitStats " />
+	<script type="text/javascript" src="sortable.js"></script>
+</head>
+<body>
+
+<div class="nav">
+<ul>
+<li><a href="index.html">一般(General)</a></li>
+<li><a href="activity.html">活动(Activity)</a></li>
+<li><a href="authors.html">作者(Authors)</a></li>
+<li><a href="files.html">文件(Files)</a></li>
+<li><a href="tags.html">里程碑(Tags)</a></li>
+</ul>
+</div>
+
+<h2><a href="#作者列表(list_of_authors)" name="作者列表(list_of_authors)">作者列表(List of Authors)</a></h2>
+
+<table class="authors sortable" id="authors"><tr><th>Author</th><th>Commits (%)</th><th>+ lines</th><th>- lines</th><th>First commit</th><th>Last commit</th><th class="unsortable">Age</th><th>Active days</th><th># by commits</th></tr><tr><td>zhangyang</td><td>27 (26.73%)</td><td>653</td><td>359</td><td>2013-08-01</td><td>2013-08-07</td><td>6 days, 2:35:42</td><td>7</td><td>1</td></tr><tr><td>huangjingquan</td><td>21 (20.79%)</td><td>838</td><td>508</td><td>2013-08-01</td><td>2013-08-09</td><td>8 days, 4:34:48</td><td>8</td><td>2</td></tr><tr><td>nieguanghui</td><td>20 (19.80%)</td><td>1169</td><td>568</td><td>2013-08-01</td><td>2013-08-09</td><td>7 days, 21:52:06</td><td>7</td><td>3</td></tr><tr><td>fanqiang</td><td>17 (16.83%)</td><td>2467</td><td>1595</td><td>2013-08-01</td><td>2013-08-09</td><td>7 days, 20:37:38</td><td>9</td><td>4</td></tr><tr><td>william</td><td>9 (8.91%)</td><td>1614</td><td>169</td><td>2013-08-01</td><td>2013-08-08</td><td>7 days, 1:46:54</td><td>4</td><td>5</td></tr><tr><td>kaizheng</td><td>6 (5.94%)</td><td>809</td><td>68</td><td>2013-08-01</td><td>2013-08-09</td><td>7 days, 20:04:01</td><td>4</td><td>6</td></tr><tr><td>wanglinchun</td><td>1 (0.99%)</td><td>7</td><td>4</td><td>2013-08-07</td><td>2013-08-07</td><td>0:00:00</td><td>1</td><td>7</td></tr></table>
+<h2><a href="#月最佳作者(author_of_month)" name="月最佳作者(author_of_month)">月最佳作者(Author of Month)</a></h2>
+
+<table class="sortable" id="aom"><tr><th>Month</th><th>Author</th><th>Commits (%)</th><th class="unsortable">Next top 5</th></tr><tr><td>2013-08</td><td>zhangyang</td><td>27 (26.73% of 101)</td><td>huangjingquan, nieguanghui, fanqiang, william</td></tr></table>
+<h2><a href="#年最佳作者(author_of_year)" name="年最佳作者(author_of_year)">年最佳作者(Author of Year)</a></h2>
+
+<table class="sortable" id="aoy"><tr><th>Year</th><th>Author</th><th>Commits (%)</th><th class="unsortable">Next top 5</th></tr><tr><td>2013</td><td>zhangyang</td><td>27 (26.73% of 101)</td><td>huangjingquan, nieguanghui, fanqiang, william</td></tr></table>
+<h2><a href="#提交统计（邮箱）commits_by_domains" name="提交统计（邮箱）commits_by_domains">提交统计（邮箱）Commits by Domains</a></h2>
+
+<div class="vtable"><table><tr><th>Domains</th><th>Total (%)</th></tr><tr><th>gmail.com</th><td>56 (55.45%)</td></tr><tr><th>163.com</th><td>28 (27.72%)</td></tr><tr><th>qq.com</th><td>17 (16.83%)</td></tr></table></div><img src="domains.svg" alt="Commits by Domains" /></body></html>
\ No newline at end of file
diff --git a/statistics/trustie2/trustie/commits_by_year.dat b/statistics/trustie2/trustie/commits_by_year.dat
new file mode 100644
index 000000000..e8acf84f3
--- /dev/null
+++ b/statistics/trustie2/trustie/commits_by_year.dat
@@ -0,0 +1 @@
+2013 101
diff --git a/statistics/trustie2/trustie/commits_by_year.plot b/statistics/trustie2/trustie/commits_by_year.plot
new file mode 100644
index 000000000..51374b3d6
--- /dev/null
+++ b/statistics/trustie2/trustie/commits_by_year.plot
@@ -0,0 +1,10 @@
+set terminal svg 
+set size 1.0,0.9
+
+set output 'commits_by_year.svg'
+unset key
+set xtics 1 rotate by 90
+set grid y
+set ylabel "Commits"
+set yrange [0:]
+plot 'commits_by_year.dat' using 1:2:(0.5) w boxes fs solid
diff --git a/statistics/trustie2/trustie/commits_by_year.svg b/statistics/trustie2/trustie/commits_by_year.svg
new file mode 100644
index 000000000..7f06bf69f
--- /dev/null
+++ b/statistics/trustie2/trustie/commits_by_year.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"  standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg 
+ width="600" height="480" 
+ viewBox="0 0 600 480"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+
+<title>Gnuplot</title>
+<desc>Produced by GNUPLOT 4.6 patchlevel 3 </desc>
+
+<g id="gnuplot_canvas">
+
+<rect x="0" y="0" width="600" height="480" fill="none"/>
+<defs>
+
+	<circle id='gpDot' r='0.5' stroke-width='0.5'/>
+	<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
+	<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
+	<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
+	<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
+	<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
+	<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
+	<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
+	<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
+	<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
+</defs>
+<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,444.0 L575.0,444.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,444.0 L80.9,444.0 M575.0,444.0 L566.0,444.0  h0.01'/>	<g transform="translate(63.6,448.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 0</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,380.8 L575.0,380.8  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,380.8 L80.9,380.8 M575.0,380.8 L566.0,380.8  h0.01'/>	<g transform="translate(63.6,385.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 20</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,317.6 L575.0,317.6  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,317.6 L80.9,317.6 M575.0,317.6 L566.0,317.6  h0.01'/>	<g transform="translate(63.6,322.1)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 40</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,254.3 L575.0,254.3  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,254.3 L80.9,254.3 M575.0,254.3 L566.0,254.3  h0.01'/>	<g transform="translate(63.6,258.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 60</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,191.1 L575.0,191.1  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,191.1 L80.9,191.1 M575.0,191.1 L566.0,191.1  h0.01'/>	<g transform="translate(63.6,195.6)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 80</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,127.9 L575.0,127.9  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,127.9 L80.9,127.9 M575.0,127.9 L566.0,127.9  h0.01'/>	<g transform="translate(63.6,132.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 100</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,64.7 L575.0,64.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,64.7 L80.9,64.7 M575.0,64.7 L566.0,64.7  h0.01'/>	<g transform="translate(63.6,69.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 120</text>
+	</g>
+	<path stroke='black'  d='M71.9,444.0 L71.9,435.0 M71.9,64.7 L71.9,73.7  h0.01'/>	<g transform="translate(76.4,452.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text> 2012</text>
+	</g>
+	<path stroke='black'  d='M323.5,444.0 L323.5,435.0 M323.5,64.7 L323.5,73.7  h0.01'/>	<g transform="translate(328.0,452.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text> 2013</text>
+	</g>
+	<path stroke='black'  d='M575.0,444.0 L575.0,435.0 M575.0,64.7 L575.0,73.7  h0.01'/>	<g transform="translate(579.5,452.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text> 2014</text>
+	</g>
+	<path stroke='black'  d='M71.9,64.7 L71.9,444.0 L575.0,444.0 L575.0,64.7 L71.9,64.7 Z  h0.01'/>	<g transform="translate(17.6,254.4) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>Commits</text>
+	</g>
+</g>
+	<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
+<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '260.6,444.0 386.4,444.0 386.4,124.7 260.6,124.7 '/>
+	</g>
+	<path stroke='red'  d='M260.6,444.0 L260.6,124.8 L386.3,124.8 L386.3,444.0 L260.6,444.0 Z  h0.01'/></g>
+	</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,64.7 L71.9,444.0 L575.0,444.0 L575.0,64.7 L71.9,64.7 Z  h0.01'/></g>
+</g>
+</svg>
+
diff --git a/statistics/trustie2/trustie/commits_by_year_month.dat b/statistics/trustie2/trustie/commits_by_year_month.dat
new file mode 100644
index 000000000..13a314638
--- /dev/null
+++ b/statistics/trustie2/trustie/commits_by_year_month.dat
@@ -0,0 +1 @@
+2013-08 101
diff --git a/statistics/trustie2/trustie/commits_by_year_month.plot b/statistics/trustie2/trustie/commits_by_year_month.plot
new file mode 100644
index 000000000..64394d1de
--- /dev/null
+++ b/statistics/trustie2/trustie/commits_by_year_month.plot
@@ -0,0 +1,13 @@
+set terminal svg 
+set size 1.0,0.9
+
+set output 'commits_by_year_month.svg'
+unset key
+set xdata time
+set timefmt "%Y-%m"
+set format x "%Y-%m"
+set xtics rotate by 90 15768000
+set bmargin 5
+set grid y
+set ylabel "Commits"
+plot 'commits_by_year_month.dat' using 1:2:(0.5) w boxes fs solid
diff --git a/statistics/trustie2/trustie/commits_by_year_month.svg b/statistics/trustie2/trustie/commits_by_year_month.svg
new file mode 100644
index 000000000..bc677a04b
--- /dev/null
+++ b/statistics/trustie2/trustie/commits_by_year_month.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"  standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg 
+ width="600" height="480" 
+ viewBox="0 0 600 480"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+
+<title>Gnuplot</title>
+<desc>Produced by GNUPLOT 4.6 patchlevel 3 </desc>
+
+<g id="gnuplot_canvas">
+
+<rect x="0" y="0" width="600" height="480" fill="none"/>
+<defs>
+
+	<circle id='gpDot' r='0.5' stroke-width='0.5'/>
+	<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
+	<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
+	<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
+	<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
+	<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
+	<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
+	<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
+	<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
+	<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
+</defs>
+<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,390.0 L575.0,390.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,390.0 L97.5,390.0 M575.0,390.0 L566.0,390.0  h0.01'/>	<g transform="translate(80.2,394.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 99.5</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,335.8 L575.0,335.8  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,335.8 L97.5,335.8 M575.0,335.8 L566.0,335.8  h0.01'/>	<g transform="translate(80.2,340.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 100</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,281.6 L575.0,281.6  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,281.6 L97.5,281.6 M575.0,281.6 L566.0,281.6  h0.01'/>	<g transform="translate(80.2,286.1)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 100.5</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,227.3 L575.0,227.3  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,227.3 L97.5,227.3 M575.0,227.3 L566.0,227.3  h0.01'/>	<g transform="translate(80.2,231.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 101</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,173.1 L575.0,173.1  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,173.1 L97.5,173.1 M575.0,173.1 L566.0,173.1  h0.01'/>	<g transform="translate(80.2,177.6)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 101.5</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,118.9 L575.0,118.9  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,118.9 L97.5,118.9 M575.0,118.9 L566.0,118.9  h0.01'/>	<g transform="translate(80.2,123.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 102</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M88.5,64.7 L575.0,64.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,64.7 L97.5,64.7 M575.0,64.7 L566.0,64.7  h0.01'/>	<g transform="translate(80.2,69.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 102.5</text>
+	</g>
+	<path stroke='black'  d='M96.3,390.0 L96.3,381.0 M96.3,64.7 L96.3,73.7  h0.01'/>	<g transform="translate(100.8,398.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-07</text>
+	</g>
+	<path stroke='black'  d='M175.7,390.0 L175.7,385.5 M175.7,64.7 L175.7,69.2 M255.1,390.0 L255.1,385.5 M255.1,64.7 L255.1,69.2 
+		M334.5,390.0 L334.5,385.5 M334.5,64.7 L334.5,69.2 M413.9,390.0 L413.9,385.5 M413.9,64.7 L413.9,69.2 
+		M493.3,390.0 L493.3,385.5 M493.3,64.7 L493.3,69.2 M575.0,390.0 L575.0,381.0 M575.0,64.7 L575.0,73.7 
+		 h0.01'/>	<g transform="translate(579.5,398.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2014-01</text>
+	</g>
+	<path stroke='black'  d='M88.5,64.7 L88.5,390.0 L575.0,390.0 L575.0,64.7 L88.5,64.7 Z  h0.01'/>	<g transform="translate(17.6,227.4) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>Commits</text>
+	</g>
+</g>
+	<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
+<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '175.9,390.0 176.0,390.0 176.0,227.2 175.9,227.2 '/>
+	</g>
+	<path stroke='red'  d='M175.9,390.0 L175.9,227.3 L175.9,390.0 Z  h0.01'/></g>
+	</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M88.5,64.7 L88.5,390.0 L575.0,390.0 L575.0,64.7 L88.5,64.7 Z  h0.01'/></g>
+</g>
+</svg>
+
diff --git a/statistics/trustie2/trustie/day_of_week.dat b/statistics/trustie2/trustie/day_of_week.dat
new file mode 100644
index 000000000..e9f9dce11
--- /dev/null
+++ b/statistics/trustie2/trustie/day_of_week.dat
@@ -0,0 +1,7 @@
+1 4
+2 15
+3 11
+4 34
+5 18
+6 9
+7 10
diff --git a/statistics/trustie2/trustie/day_of_week.plot b/statistics/trustie2/trustie/day_of_week.plot
new file mode 100644
index 000000000..65be4afde
--- /dev/null
+++ b/statistics/trustie2/trustie/day_of_week.plot
@@ -0,0 +1,10 @@
+set terminal svg 
+set size 1.0,0.9
+
+set output 'day_of_week.svg'
+unset key
+set xrange [0.5:7.5]
+set xtics 1
+set grid y
+set ylabel "Commits"
+plot 'day_of_week.dat' using 1:2:(0.5) w boxes fs solid
diff --git a/statistics/trustie2/trustie/day_of_week.svg b/statistics/trustie2/trustie/day_of_week.svg
new file mode 100644
index 000000000..30ef94ded
--- /dev/null
+++ b/statistics/trustie2/trustie/day_of_week.svg
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"  standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg 
+ width="600" height="480" 
+ viewBox="0 0 600 480"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+
+<title>Gnuplot</title>
+<desc>Produced by GNUPLOT 4.6 patchlevel 3 </desc>
+
+<g id="gnuplot_canvas">
+
+<rect x="0" y="0" width="600" height="480" fill="none"/>
+<defs>
+
+	<circle id='gpDot' r='0.5' stroke-width='0.5'/>
+	<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
+	<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
+	<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
+	<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
+	<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
+	<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
+	<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
+	<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
+	<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
+</defs>
+<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,444.0 L575.0,444.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,444.0 L72.6,444.0 M575.0,444.0 L566.0,444.0  h0.01'/>	<g transform="translate(55.3,448.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 0</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,389.8 L575.0,389.8  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,389.8 L72.6,389.8 M575.0,389.8 L566.0,389.8  h0.01'/>	<g transform="translate(55.3,394.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 5</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,335.6 L575.0,335.6  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,335.6 L72.6,335.6 M575.0,335.6 L566.0,335.6  h0.01'/>	<g transform="translate(55.3,340.1)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 10</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,281.4 L575.0,281.4  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,281.4 L72.6,281.4 M575.0,281.4 L566.0,281.4  h0.01'/>	<g transform="translate(55.3,285.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 15</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,227.3 L575.0,227.3  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,227.3 L72.6,227.3 M575.0,227.3 L566.0,227.3  h0.01'/>	<g transform="translate(55.3,231.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 20</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,173.1 L575.0,173.1  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,173.1 L72.6,173.1 M575.0,173.1 L566.0,173.1  h0.01'/>	<g transform="translate(55.3,177.6)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 25</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,118.9 L575.0,118.9  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,118.9 L72.6,118.9 M575.0,118.9 L566.0,118.9  h0.01'/>	<g transform="translate(55.3,123.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 30</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,64.7 L575.0,64.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,64.7 L72.6,64.7 M575.0,64.7 L566.0,64.7  h0.01'/>	<g transform="translate(55.3,69.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 35</text>
+	</g>
+	<path stroke='black'  d='M100.1,444.0 L100.1,435.0 M100.1,64.7 L100.1,73.7  h0.01'/>	<g transform="translate(100.1,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 1</text>
+	</g>
+	<path stroke='black'  d='M173.2,444.0 L173.2,435.0 M173.2,64.7 L173.2,73.7  h0.01'/>	<g transform="translate(173.2,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 2</text>
+	</g>
+	<path stroke='black'  d='M246.2,444.0 L246.2,435.0 M246.2,64.7 L246.2,73.7  h0.01'/>	<g transform="translate(246.2,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 3</text>
+	</g>
+	<path stroke='black'  d='M319.3,444.0 L319.3,435.0 M319.3,64.7 L319.3,73.7  h0.01'/>	<g transform="translate(319.3,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 4</text>
+	</g>
+	<path stroke='black'  d='M392.4,444.0 L392.4,435.0 M392.4,64.7 L392.4,73.7  h0.01'/>	<g transform="translate(392.4,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 5</text>
+	</g>
+	<path stroke='black'  d='M465.4,444.0 L465.4,435.0 M465.4,64.7 L465.4,73.7  h0.01'/>	<g transform="translate(465.4,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 6</text>
+	</g>
+	<path stroke='black'  d='M538.5,444.0 L538.5,435.0 M538.5,64.7 L538.5,73.7  h0.01'/>	<g transform="translate(538.5,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 7</text>
+	</g>
+	<path stroke='black'  d='M63.6,64.7 L63.6,444.0 L575.0,444.0 L575.0,64.7 L63.6,64.7 Z  h0.01'/>	<g transform="translate(17.6,254.4) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>Commits</text>
+	</g>
+</g>
+	<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
+<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '81.9,444.0 118.5,444.0 118.5,400.6 81.9,400.6 '/>
+	</g>
+	<path stroke='red'  d='M81.9,444.0 L81.9,400.7 L118.4,400.7 L118.4,444.0 L81.9,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '154.9,444.0 191.6,444.0 191.6,281.3 154.9,281.3 '/>
+	</g>
+	<path stroke='red'  d='M154.9,444.0 L154.9,281.4 L191.5,281.4 L191.5,444.0 L154.9,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '228.0,444.0 264.6,444.0 264.6,324.7 228.0,324.7 '/>
+	</g>
+	<path stroke='red'  d='M228.0,444.0 L228.0,324.8 L264.5,324.8 L264.5,444.0 L228.0,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '301.0,444.0 337.7,444.0 337.7,75.4 301.0,75.4 '/>
+	</g>
+	<path stroke='red'  d='M301.0,444.0 L301.0,75.5 L337.6,75.5 L337.6,444.0 L301.0,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '374.1,444.0 410.7,444.0 410.7,248.8 374.1,248.8 '/>
+	</g>
+	<path stroke='red'  d='M374.1,444.0 L374.1,248.9 L410.6,248.9 L410.6,444.0 L374.1,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '447.2,444.0 483.8,444.0 483.8,346.4 447.2,346.4 '/>
+	</g>
+	<path stroke='red'  d='M447.2,444.0 L447.2,346.5 L483.7,346.5 L483.7,444.0 L447.2,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '520.2,444.0 556.8,444.0 556.8,335.5 520.2,335.5 '/>
+	</g>
+	<path stroke='red'  d='M520.2,444.0 L520.2,335.6 L556.7,335.6 L556.7,444.0 L520.2,444.0 Z  h0.01'/></g>
+	</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,64.7 L63.6,444.0 L575.0,444.0 L575.0,64.7 L63.6,64.7 Z  h0.01'/></g>
+</g>
+</svg>
+
diff --git a/statistics/trustie2/trustie/domains.dat b/statistics/trustie2/trustie/domains.dat
new file mode 100644
index 000000000..082a980f0
--- /dev/null
+++ b/statistics/trustie2/trustie/domains.dat
@@ -0,0 +1,3 @@
+gmail.com 1 56
+163.com 2 28
+qq.com 3 17
diff --git a/statistics/trustie2/trustie/domains.plot b/statistics/trustie2/trustie/domains.plot
new file mode 100644
index 000000000..fb2b932a9
--- /dev/null
+++ b/statistics/trustie2/trustie/domains.plot
@@ -0,0 +1,9 @@
+set terminal svg 
+set size 1.0,0.9
+
+set output 'domains.svg'
+unset key
+unset xtics
+set grid y
+set ylabel "Commits"
+plot 'domains.dat' using 2:3:(0.5) with boxes fs solid, '' using 2:3:1 with labels rotate by 45 offset 0,1
diff --git a/statistics/trustie2/trustie/domains.svg b/statistics/trustie2/trustie/domains.svg
new file mode 100644
index 000000000..fe12b4260
--- /dev/null
+++ b/statistics/trustie2/trustie/domains.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"  standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg 
+ width="600" height="480" 
+ viewBox="0 0 600 480"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+
+<title>Gnuplot</title>
+<desc>Produced by GNUPLOT 4.6 patchlevel 3 </desc>
+
+<g id="gnuplot_canvas">
+
+<rect x="0" y="0" width="600" height="480" fill="none"/>
+<defs>
+
+	<circle id='gpDot' r='0.5' stroke-width='0.5'/>
+	<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
+	<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
+	<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
+	<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
+	<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
+	<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
+	<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
+	<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
+	<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
+</defs>
+<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,463.4 L575.0,463.4  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,463.4 L72.6,463.4 M575.0,463.4 L566.0,463.4  h0.01'/>	<g transform="translate(55.3,467.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 15</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,419.1 L575.0,419.1  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,419.1 L72.6,419.1 M575.0,419.1 L566.0,419.1  h0.01'/>	<g transform="translate(55.3,423.6)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 20</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,374.8 L575.0,374.8  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,374.8 L72.6,374.8 M575.0,374.8 L566.0,374.8  h0.01'/>	<g transform="translate(55.3,379.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 25</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,330.5 L575.0,330.5  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,330.5 L72.6,330.5 M575.0,330.5 L566.0,330.5  h0.01'/>	<g transform="translate(55.3,335.0)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 30</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,286.2 L575.0,286.2  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,286.2 L72.6,286.2 M575.0,286.2 L566.0,286.2  h0.01'/>	<g transform="translate(55.3,290.7)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 35</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,241.9 L575.0,241.9  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,241.9 L72.6,241.9 M575.0,241.9 L566.0,241.9  h0.01'/>	<g transform="translate(55.3,246.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 40</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,197.6 L575.0,197.6  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,197.6 L72.6,197.6 M575.0,197.6 L566.0,197.6  h0.01'/>	<g transform="translate(55.3,202.1)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 45</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,153.3 L575.0,153.3  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,153.3 L72.6,153.3 M575.0,153.3 L566.0,153.3  h0.01'/>	<g transform="translate(55.3,157.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 50</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,109.0 L575.0,109.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,109.0 L72.6,109.0 M575.0,109.0 L566.0,109.0  h0.01'/>	<g transform="translate(55.3,113.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 55</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,64.7 L575.0,64.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,64.7 L72.6,64.7 M575.0,64.7 L566.0,64.7  h0.01'/>	<g transform="translate(55.3,69.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 60</text>
+	</g>
+	<path stroke='black'  d='M63.6,64.7 L63.6,463.4 L575.0,463.4 L575.0,64.7 L63.6,64.7 Z  h0.01'/>	<g transform="translate(17.6,264.1) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>Commits</text>
+	</g>
+</g>
+	<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
+<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '106.2,463.4 191.6,463.4 191.6,100.0 106.2,100.0 '/>
+	</g>
+	<path stroke='red'  d='M106.2,463.4 L106.2,100.1 L191.5,100.1 L191.5,463.4 L106.2,463.4 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '276.7,463.4 362.0,463.4 362.0,348.1 276.7,348.1 '/>
+	</g>
+	<path stroke='red'  d='M276.7,463.4 L276.7,348.2 L361.9,348.2 L361.9,463.4 L276.7,463.4 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '447.2,463.4 532.5,463.4 532.5,445.6 447.2,445.6 '/>
+	</g>
+	<path stroke='red'  d='M447.2,463.4 L447.2,445.7 L532.4,445.7 L532.4,463.4 L447.2,463.4 Z  h0.01'/></g>
+	</g>
+	<g id="gnuplot_plot_2" ><title>gnuplot_plot_2</title>
+<g style="fill:none; color:green; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<g transform="translate(153.3,82.1) rotate(-45)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>gmail.com</text>
+	</g>
+	<g transform="translate(323.8,330.2) rotate(-45)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>163.com</text>
+	</g>
+	<g transform="translate(494.3,427.7) rotate(-45)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>qq.com</text>
+	</g>
+</g>
+	</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,64.7 L63.6,463.4 L575.0,463.4 L575.0,64.7 L63.6,64.7 Z  h0.01'/></g>
+</g>
+</svg>
+
diff --git a/statistics/trustie2/trustie/files.html b/statistics/trustie2/trustie/files.html
new file mode 100644
index 000000000..f22c4792b
--- /dev/null
+++ b/statistics/trustie2/trustie/files.html
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<!--<title>GitStats - trustie2</title>-->
+	<link rel="stylesheet" href="gitstats.css" type="text/css" />
+	<meta name="generator" content="GitStats " />
+	<script type="text/javascript" src="sortable.js"></script>
+</head>
+<body>
+
+<div class="nav">
+<ul>
+<li><a href="index.html">一般(General)</a></li>
+<li><a href="activity.html">活动(Activity)</a></li>
+<li><a href="authors.html">作者(Authors)</a></li>
+<li><a href="files.html">文件(Files)</a></li>
+<li><a href="tags.html">里程碑(Tags)</a></li>
+</ul>
+</div>
+<dl>
+<dt>文件总数(Total files)</dt><dd>1848</dd><dt>代码总行数(Total Lines of Code)</dt><dd>193300</dd><dt>修改代码行数(Total Modified lines)</dt><dd>3197</dd><dt>平均文件大小(Average file size)</dt><dd>173.00 bytes</dd></dl>
+
+<h2><a href="#文件数目统计(file_count_by_date)" name="文件数目统计(file_count_by_date)">文件数目统计(File count by date)</a></h2>
+
+<img src="files_by_date.svg" alt="Files by Date" />
+<h2><a href="#代码行数统计(lines_of_code)" name="代码行数统计(lines_of_code)">代码行数统计(Lines of Code)</a></h2>
+
+<img src="lines_of_code.svg" />
+<h2><a href="#文件信息统计(file_information)" name="文件信息统计(file_information)">文件信息统计(File information)</a></h2>
+
+<table class="sortable" id="ext"><tr><th>Type</th><th>Files (%)</th><th>Lines (%)</th><th>Lines/file</th></tr><tr><td></td><td>72 (3.90%)</td><td>13511 (422.61%)</td><td>187</td></tr><tr><td>15/AUTHORS</td><td>1 (0.05%)</td><td>38 (1.19%)</td><td>38</td></tr><tr><td>15/BUGS</td><td>1 (0.05%)</td><td>3 (0.09%)</td><td>3</td></tr><tr><td>15/LICENSE</td><td>1 (0.05%)</td><td>98 (3.07%)</td><td>98</td></tr><tr><td>15/NEWS</td><td>1 (0.05%)</td><td>789 (24.68%)</td><td>789</td></tr><tr><td>15/README</td><td>1 (0.05%)</td><td>59 (1.85%)</td><td>59</td></tr><tr><td>TXT</td><td>4 (0.22%)</td><td>327 (10.23%)</td><td>81</td></tr><tr><td>autotest</td><td>1 (0.05%)</td><td>12 (0.38%)</td><td>12</td></tr><tr><td>builder</td><td>2 (0.11%)</td><td>61 (1.91%)</td><td>30</td></tr><tr><td>conf</td><td>1 (0.05%)</td><td>32 (1.00%)</td><td>32</td></tr><tr><td>css</td><td>23 (1.24%)</td><td>6761 (211.48%)</td><td>293</td></tr><tr><td>db</td><td>1 (0.05%)</td><td>578 (18.08%)</td><td>578</td></tr><tr><td>eot</td><td>1 (0.05%)</td><td>127 (3.97%)</td><td>127</td></tr><tr><td>erb</td><td>422 (22.84%)</td><td>11803 (369.19%)</td><td>27</td></tr><tr><td>example</td><td>5 (0.27%)</td><td>337 (10.54%)</td><td>67</td></tr><tr><td>exe</td><td>1 (0.05%)</td><td>1972 (61.68%)</td><td>1972</td></tr><tr><td>gemfile</td><td>2 (0.11%)</td><td>14 (0.44%)</td><td>7</td></tr><tr><td>gemspec</td><td>3 (0.16%)</td><td>82 (2.56%)</td><td>27</td></tr><tr><td>gif</td><td>16 (0.87%)</td><td>603 (18.86%)</td><td>37</td></tr><tr><td>gitignore</td><td>2 (0.11%)</td><td>22 (0.69%)</td><td>11</td></tr><tr><td>html</td><td>5 (0.27%)</td><td>419 (13.11%)</td><td>83</td></tr><tr><td>ico</td><td>2 (0.11%)</td><td>60 (1.88%)</td><td>30</td></tr><tr><td>jpg</td><td>66 (3.57%)</td><td>1577 (49.33%)</td><td>23</td></tr><tr><td>js</td><td>109 (5.90%)</td><td>4121 (128.90%)</td><td>37</td></tr><tr><td>lock</td><td>1 (0.05%)</td><td>157 (4.91%)</td><td>157</td></tr><tr><td>map</td><td>20 (1.08%)</td><td>4996 (156.27%)</td><td>249</td></tr><tr><td>md</td><td>4 (0.22%)</td><td>445 (13.92%)</td><td>111</td></tr><tr><td>me</td><td>1 (0.05%)</td><td>0 (0.00%)</td><td>0</td></tr><tr><td>noencode</td><td>2 (0.11%)</td><td>0 (0.00%)</td><td>0</td></tr><tr><td>otf</td><td>1 (0.05%)</td><td>1271 (39.76%)</td><td>1271</td></tr><tr><td>php</td><td>2 (0.11%)</td><td>723 (22.61%)</td><td>361</td></tr><tr><td>pm</td><td>1 (0.05%)</td><td>544 (17.02%)</td><td>544</td></tr><tr><td>png</td><td>229 (12.39%)</td><td>5379 (168.25%)</td><td>23</td></tr><tr><td>pptx</td><td>1 (0.05%)</td><td>1224 (38.29%)</td><td>1224</td></tr><tr><td>py</td><td>1 (0.05%)</td><td>220 (6.88%)</td><td>220</td></tr><tr><td>rake</td><td>19 (1.03%)</td><td>2212 (69.19%)</td><td>116</td></tr><tr><td>rb</td><td>677 (36.63%)</td><td>66276 (2073.07%)</td><td>97</td></tr><tr><td>rdoc</td><td>4 (0.22%)</td><td>162 (5.07%)</td><td>40</td></tr><tr><td>rfpdf</td><td>1 (0.05%)</td><td>114 (3.57%)</td><td>114</td></tr><tr><td>rsb</td><td>32 (1.73%)</td><td>510 (15.95%)</td><td>15</td></tr><tr><td>rspec</td><td>1 (0.05%)</td><td>2 (0.06%)</td><td>2</td></tr><tr><td>ru</td><td>1 (0.05%)</td><td>4 (0.13%)</td><td>4</td></tr><tr><td>sample</td><td>1 (0.05%)</td><td>19 (0.59%)</td><td>19</td></tr><tr><td>sqlite3</td><td>1 (0.05%)</td><td>0 (0.00%)</td><td>0</td></tr><tr><td>svg</td><td>1 (0.05%)</td><td>338 (10.57%)</td><td>338</td></tr><tr><td>tmpl</td><td>1 (0.05%)</td><td>12 (0.38%)</td><td>12</td></tr><tr><td>ttf</td><td>1 (0.05%)</td><td>708 (22.15%)</td><td>708</td></tr><tr><td>txt</td><td>6 (0.32%)</td><td>5520 (172.66%)</td><td>920</td></tr><tr><td>woff</td><td>1 (0.05%)</td><td>105 (3.28%)</td><td>105</td></tr><tr><td>yml</td><td>77 (4.17%)</td><td>54013 (1689.49%)</td><td>701</td></tr><tr><td>z</td><td>17 (0.92%)</td><td>4940 (154.52%)</td><td>290</td></tr></table></body></html>
\ No newline at end of file
diff --git a/statistics/trustie2/trustie/files_by_date.dat b/statistics/trustie2/trustie/files_by_date.dat
new file mode 100644
index 000000000..b28457f4d
--- /dev/null
+++ b/statistics/trustie2/trustie/files_by_date.dat
@@ -0,0 +1,34 @@
+2013-08-01 1695
+2013-08-01 1696
+2013-08-01 1697
+2013-08-01 1698
+2013-08-01 1699
+2013-08-01 1704
+2013-08-01 1709
+2013-08-01 1711
+2013-08-01 1712
+2013-08-01 1714
+2013-08-01 1720
+2013-08-02 1712
+2013-08-02 1717
+2013-08-02 1718
+2013-08-03 1718
+2013-08-03 1719
+2013-08-04 1719
+2013-08-04 1721
+2013-08-04 1724
+2013-08-05 1724
+2013-08-05 1725
+2013-08-06 1725
+2013-08-06 1783
+2013-08-06 1784
+2013-08-07 1784
+2013-08-08 1784
+2013-08-08 1785
+2013-08-08 1839
+2013-08-08 1844
+2013-08-08 1845
+2013-08-08 1846
+2013-08-08 1847
+2013-08-09 1847
+2013-08-09 1849
diff --git a/statistics/trustie2/trustie/files_by_date.plot b/statistics/trustie2/trustie/files_by_date.plot
new file mode 100644
index 000000000..e09f27324
--- /dev/null
+++ b/statistics/trustie2/trustie/files_by_date.plot
@@ -0,0 +1,14 @@
+set terminal svg 
+set size 1.0,0.9
+
+set output 'files_by_date.svg'
+unset key
+set xdata time
+set timefmt "%Y-%m-%d"
+set format x "%Y-%m-%d"
+set grid y
+set ylabel "Files"
+set xtics rotate by 90
+set ytics autofreq
+set bmargin 6
+plot 'files_by_date.dat' using 1:2 w steps
diff --git a/statistics/trustie2/trustie/files_by_date.svg b/statistics/trustie2/trustie/files_by_date.svg
new file mode 100644
index 000000000..e78eb9f19
--- /dev/null
+++ b/statistics/trustie2/trustie/files_by_date.svg
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"  standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg 
+ width="600" height="480" 
+ viewBox="0 0 600 480"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+
+<title>Gnuplot</title>
+<desc>Produced by GNUPLOT 4.6 patchlevel 3 </desc>
+
+<g id="gnuplot_canvas">
+
+<rect x="0" y="0" width="600" height="480" fill="none"/>
+<defs>
+
+	<circle id='gpDot' r='0.5' stroke-width='0.5'/>
+	<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
+	<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
+	<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
+	<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
+	<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
+	<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
+	<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
+	<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
+	<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
+</defs>
+<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,372.0 L575.0,372.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,372.0 L89.2,372.0 M575.0,372.0 L566.0,372.0  h0.01'/>	<g transform="translate(71.9,376.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1680</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,337.9 L575.0,337.9  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,337.9 L89.2,337.9 M575.0,337.9 L566.0,337.9  h0.01'/>	<g transform="translate(71.9,342.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1700</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,303.7 L575.0,303.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,303.7 L89.2,303.7 M575.0,303.7 L566.0,303.7  h0.01'/>	<g transform="translate(71.9,308.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1720</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,269.6 L575.0,269.6  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,269.6 L89.2,269.6 M575.0,269.6 L566.0,269.6  h0.01'/>	<g transform="translate(71.9,274.1)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1740</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,235.4 L575.0,235.4  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,235.4 L89.2,235.4 M575.0,235.4 L566.0,235.4  h0.01'/>	<g transform="translate(71.9,239.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1760</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,201.3 L575.0,201.3  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,201.3 L89.2,201.3 M575.0,201.3 L566.0,201.3  h0.01'/>	<g transform="translate(71.9,205.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1780</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,167.1 L575.0,167.1  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,167.1 L89.2,167.1 M575.0,167.1 L566.0,167.1  h0.01'/>	<g transform="translate(71.9,171.6)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1800</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,133.0 L575.0,133.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,133.0 L89.2,133.0 M575.0,133.0 L566.0,133.0  h0.01'/>	<g transform="translate(71.9,137.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1820</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,98.8 L575.0,98.8  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,98.8 L89.2,98.8 M575.0,98.8 L566.0,98.8  h0.01'/>	<g transform="translate(71.9,103.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1840</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,64.7 L575.0,64.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,64.7 L89.2,64.7 M575.0,64.7 L566.0,64.7  h0.01'/>	<g transform="translate(71.9,69.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1860</text>
+	</g>
+	<path stroke='black'  d='M80.2,372.0 L80.2,363.0 M80.2,64.7 L80.2,73.7  h0.01'/>	<g transform="translate(84.7,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-01</text>
+	</g>
+	<path stroke='black'  d='M95.7,372.0 L95.7,367.5 M95.7,64.7 L95.7,69.2 M111.1,372.0 L111.1,367.5 M111.1,64.7 L111.1,69.2 
+		M126.6,372.0 L126.6,367.5 M126.6,64.7 L126.6,69.2 M142.1,372.0 L142.1,363.0 M142.1,64.7 L142.1,73.7 
+		 h0.01'/>	<g transform="translate(146.6,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-02</text>
+	</g>
+	<path stroke='black'  d='M157.5,372.0 L157.5,367.5 M157.5,64.7 L157.5,69.2 M173.0,372.0 L173.0,367.5 M173.0,64.7 L173.0,69.2 
+		M188.4,372.0 L188.4,367.5 M188.4,64.7 L188.4,69.2 M203.9,372.0 L203.9,363.0 M203.9,64.7 L203.9,73.7 
+		 h0.01'/>	<g transform="translate(208.4,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-03</text>
+	</g>
+	<path stroke='black'  d='M219.4,372.0 L219.4,367.5 M219.4,64.7 L219.4,69.2 M234.8,372.0 L234.8,367.5 M234.8,64.7 L234.8,69.2 
+		M250.3,372.0 L250.3,367.5 M250.3,64.7 L250.3,69.2 M265.8,372.0 L265.8,363.0 M265.8,64.7 L265.8,73.7 
+		 h0.01'/>	<g transform="translate(270.3,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-04</text>
+	</g>
+	<path stroke='black'  d='M281.2,372.0 L281.2,367.5 M281.2,64.7 L281.2,69.2 M296.7,372.0 L296.7,367.5 M296.7,64.7 L296.7,69.2 
+		M312.1,372.0 L312.1,367.5 M312.1,64.7 L312.1,69.2 M327.6,372.0 L327.6,363.0 M327.6,64.7 L327.6,73.7 
+		 h0.01'/>	<g transform="translate(332.1,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-05</text>
+	</g>
+	<path stroke='black'  d='M343.1,372.0 L343.1,367.5 M343.1,64.7 L343.1,69.2 M358.5,372.0 L358.5,367.5 M358.5,64.7 L358.5,69.2 
+		M374.0,372.0 L374.0,367.5 M374.0,64.7 L374.0,69.2 M389.5,372.0 L389.5,363.0 M389.5,64.7 L389.5,73.7 
+		 h0.01'/>	<g transform="translate(394.0,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-06</text>
+	</g>
+	<path stroke='black'  d='M404.9,372.0 L404.9,367.5 M404.9,64.7 L404.9,69.2 M420.4,372.0 L420.4,367.5 M420.4,64.7 L420.4,69.2 
+		M435.8,372.0 L435.8,367.5 M435.8,64.7 L435.8,69.2 M451.3,372.0 L451.3,363.0 M451.3,64.7 L451.3,73.7 
+		 h0.01'/>	<g transform="translate(455.8,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-07</text>
+	</g>
+	<path stroke='black'  d='M466.8,372.0 L466.8,367.5 M466.8,64.7 L466.8,69.2 M482.2,372.0 L482.2,367.5 M482.2,64.7 L482.2,69.2 
+		M497.7,372.0 L497.7,367.5 M497.7,64.7 L497.7,69.2 M513.2,372.0 L513.2,363.0 M513.2,64.7 L513.2,73.7 
+		 h0.01'/>	<g transform="translate(517.7,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-08</text>
+	</g>
+	<path stroke='black'  d='M528.6,372.0 L528.6,367.5 M528.6,64.7 L528.6,69.2 M544.1,372.0 L544.1,367.5 M544.1,64.7 L544.1,69.2 
+		M559.5,372.0 L559.5,367.5 M559.5,64.7 L559.5,69.2 M575.0,372.0 L575.0,363.0 M575.0,64.7 L575.0,73.7 
+		 h0.01'/>	<g transform="translate(579.5,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-09</text>
+	</g>
+	<path stroke='black'  d='M80.2,64.7 L80.2,372.0 L575.0,372.0 L575.0,64.7 L80.2,64.7 Z  h0.01'/>	<g transform="translate(17.6,218.4) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>Files</text>
+	</g>
+</g>
+	<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
+<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='red'  d='M80.2,346.4 L80.2,344.7 L80.2,343.0 L80.2,341.3 L80.2,339.6 L80.2,331.0 L80.2,322.5 L80.2,319.1 
+		L80.2,317.4 L80.2,314.0 L80.2,303.7 L142.1,303.7 L142.1,317.4 L142.1,308.8 L142.1,307.1 L203.9,307.1 
+		L203.9,305.4 L265.8,305.4 L265.8,302.0 L265.8,296.9 L327.6,296.9 L327.6,295.2 L389.5,295.2 L389.5,196.2 
+		L389.5,194.4 L451.3,194.4 L513.2,194.4 L513.2,192.7 L513.2,100.6 L513.2,92.0 L513.2,90.3 L513.2,88.6 
+		L513.2,86.9 L575.0,86.9 L575.0,83.5  h0.01'/></g>
+	</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,64.7 L80.2,372.0 L575.0,372.0 L575.0,64.7 L80.2,64.7 Z  h0.01'/></g>
+</g>
+</svg>
+
diff --git a/statistics/trustie2/trustie/gitstats.cache b/statistics/trustie2/trustie/gitstats.cache
new file mode 100644
index 000000000..2fc19781e
Binary files /dev/null and b/statistics/trustie2/trustie/gitstats.cache differ
diff --git a/statistics/trustie2/trustie/gitstats.css b/statistics/trustie2/trustie/gitstats.css
new file mode 100644
index 000000000..6a341e6f4
--- /dev/null
+++ b/statistics/trustie2/trustie/gitstats.css
@@ -0,0 +1,155 @@
+/**
+ * GitStats - default style
+ */
+body {
+	color: black;
+	background-color: #fff;
+}
+
+dt {
+	font-size: 12px;
+	font-weight: bold;
+	float: left;
+	margin-right: 1em;
+	margin-left: 10px;
+}
+
+dt:after {
+	content: ': ';
+}
+
+dd {
+	font-size: 11px;
+	display: block;
+	clear: left;
+}
+
+table {
+	border: 1px solid black;
+	border-collapse: collapse;
+	font-size: 59%;
+	margin-bottom: 1em;
+}
+
+table.noborders {
+	border: none;
+}
+
+table.noborders td {
+	border: none;
+}
+
+.vtable {
+	float: right;
+	clear: both;
+}
+
+table.tags td {
+	vertical-align: top;
+}
+
+th {
+	background-color: #ddf;
+}
+
+th a {
+	text-decoration: none;
+}
+
+tr:hover {
+	background-color: #ddf;
+}
+
+td {
+	border: 1px solid black;
+	padding: 0.2em;
+	padding-left: 0.3em;
+	padding-right: 0.2em;
+}
+
+/* Navigation bar; tabbed style */
+.nav {
+	height: 2em; margin-bottom:1.2em; position:relative; overflow:hidden;margin-top: -10px;
+}
+
+.nav ul {
+	margin:0; position:absolute; bottom:0; padding-left:0.5em;
+}
+
+.nav li {
+	float:left;
+  	list-style-type:none;
+  	white-space:nowrap;
+  	margin-right:0px;
+  	background:#fff;
+  	position:relative;
+  	margin-bottom:5px;
+}
+
+.nav li a {
+	font-size: 0.8em;
+  	text-decoration:none;
+  	line-height:1.3em;
+ 	padding:2px 6px 2px 6px;
+  	border: 1px solid #ccc;
+  	border-bottom: 1px solid #bbbbbb;
+  	background-color:#DEEBF0;
+  	color:#999;
+  	font-weight:bold;
+  	border-top-left-radius:3px;
+  	border-top-right-radius:3px;
+}
+
+.nav li a:hover {
+	background-color: #cacbcb;
+  	text-decoration:none;
+}
+
+img {
+	border: 1px solid black;
+	padding: 0.5em;
+	background-color: white;
+}
+
+th img {
+	border: 0px;
+	padding: 0px;
+	background-color: #ddf;
+}
+
+h1 a, h2 a {
+	color: black;
+	text-decoration: none;
+}
+
+h1:hover a:after,
+h2:hover a:after {
+	content: '^';
+	color: #555;
+}
+
+h1 {
+	font-size: x-large;
+}
+
+h2 {
+	background-color: #C6E9F1;
+	border: 1px solid #C6E9F1;
+	padding-left: 0.5em;
+	padding-right: 0.5em;
+	color: black;
+	font-size: 0.8em;
+	clear: both;
+}
+
+h2 a {
+	color: black;
+}
+
+p{
+	font-size: 0.7em;
+}
+
+.moreauthors {
+	font-size: 70%;
+}
diff --git a/statistics/trustie2/trustie/hour_of_day.dat b/statistics/trustie2/trustie/hour_of_day.dat
new file mode 100644
index 000000000..328fc206f
--- /dev/null
+++ b/statistics/trustie2/trustie/hour_of_day.dat
@@ -0,0 +1,24 @@
+1 6
+2 6
+3 17
+4 9
+5 0
+6 0
+7 1
+8 4
+9 8
+10 6
+11 0
+12 4
+13 14
+14 10
+15 16
+16 0
+17 0
+18 0
+19 0
+20 0
+21 0
+22 0
+23 0
+24 0
diff --git a/statistics/trustie2/trustie/hour_of_day.plot b/statistics/trustie2/trustie/hour_of_day.plot
new file mode 100644
index 000000000..1fee4c643
--- /dev/null
+++ b/statistics/trustie2/trustie/hour_of_day.plot
@@ -0,0 +1,10 @@
+set terminal svg 
+set size 1.0,0.9
+
+set output 'hour_of_day.svg'
+unset key
+set xrange [0.5:24.5]
+set xtics 4
+set grid y
+set ylabel "Commits"
+plot 'hour_of_day.dat' using 1:2:(0.5) w boxes fs solid
diff --git a/statistics/trustie2/trustie/hour_of_day.svg b/statistics/trustie2/trustie/hour_of_day.svg
new file mode 100644
index 000000000..b9c4b9e3b
--- /dev/null
+++ b/statistics/trustie2/trustie/hour_of_day.svg
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"  standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg 
+ width="600" height="480" 
+ viewBox="0 0 600 480"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+
+<title>Gnuplot</title>
+<desc>Produced by GNUPLOT 4.6 patchlevel 3 </desc>
+
+<g id="gnuplot_canvas">
+
+<rect x="0" y="0" width="600" height="480" fill="none"/>
+<defs>
+
+	<circle id='gpDot' r='0.5' stroke-width='0.5'/>
+	<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
+	<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
+	<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
+	<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
+	<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
+	<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
+	<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
+	<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
+	<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
+</defs>
+<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,444.0 L575.0,444.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,444.0 L72.6,444.0 M575.0,444.0 L566.0,444.0  h0.01'/>	<g transform="translate(55.3,448.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 0</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,401.9 L575.0,401.9  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,401.9 L72.6,401.9 M575.0,401.9 L566.0,401.9  h0.01'/>	<g transform="translate(55.3,406.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 2</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,359.7 L575.0,359.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,359.7 L72.6,359.7 M575.0,359.7 L566.0,359.7  h0.01'/>	<g transform="translate(55.3,364.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 4</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,317.6 L575.0,317.6  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,317.6 L72.6,317.6 M575.0,317.6 L566.0,317.6  h0.01'/>	<g transform="translate(55.3,322.1)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 6</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,275.4 L575.0,275.4  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,275.4 L72.6,275.4 M575.0,275.4 L566.0,275.4  h0.01'/>	<g transform="translate(55.3,279.9)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 8</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,233.3 L575.0,233.3  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,233.3 L72.6,233.3 M575.0,233.3 L566.0,233.3  h0.01'/>	<g transform="translate(55.3,237.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 10</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,191.1 L575.0,191.1  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,191.1 L72.6,191.1 M575.0,191.1 L566.0,191.1  h0.01'/>	<g transform="translate(55.3,195.6)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 12</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,149.0 L575.0,149.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,149.0 L72.6,149.0 M575.0,149.0 L566.0,149.0  h0.01'/>	<g transform="translate(55.3,153.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 14</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,106.8 L575.0,106.8  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,106.8 L72.6,106.8 M575.0,106.8 L566.0,106.8  h0.01'/>	<g transform="translate(55.3,111.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 16</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M63.6,64.7 L575.0,64.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,64.7 L72.6,64.7 M575.0,64.7 L566.0,64.7  h0.01'/>	<g transform="translate(55.3,69.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 18</text>
+	</g>
+	<path stroke='black'  d='M138.2,444.0 L138.2,435.0 M138.2,64.7 L138.2,73.7  h0.01'/>	<g transform="translate(138.2,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 4</text>
+	</g>
+	<path stroke='black'  d='M223.4,444.0 L223.4,435.0 M223.4,64.7 L223.4,73.7  h0.01'/>	<g transform="translate(223.4,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 8</text>
+	</g>
+	<path stroke='black'  d='M308.6,444.0 L308.6,435.0 M308.6,64.7 L308.6,73.7  h0.01'/>	<g transform="translate(308.6,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 12</text>
+	</g>
+	<path stroke='black'  d='M393.9,444.0 L393.9,435.0 M393.9,64.7 L393.9,73.7  h0.01'/>	<g transform="translate(393.9,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 16</text>
+	</g>
+	<path stroke='black'  d='M479.1,444.0 L479.1,435.0 M479.1,64.7 L479.1,73.7  h0.01'/>	<g transform="translate(479.1,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 20</text>
+	</g>
+	<path stroke='black'  d='M564.3,444.0 L564.3,435.0 M564.3,64.7 L564.3,73.7  h0.01'/>	<g transform="translate(564.3,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 24</text>
+	</g>
+	<path stroke='black'  d='M63.6,64.7 L63.6,444.0 L575.0,444.0 L575.0,64.7 L63.6,64.7 Z  h0.01'/>	<g transform="translate(17.6,254.4) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>Commits</text>
+	</g>
+</g>
+	<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
+<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '68.9,444.0 79.7,444.0 79.7,317.5 68.9,317.5 '/>
+	</g>
+	<path stroke='red'  d='M68.9,444.0 L68.9,317.6 L79.6,317.6 L79.6,444.0 L68.9,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '90.2,444.0 101.0,444.0 101.0,317.5 90.2,317.5 '/>
+	</g>
+	<path stroke='red'  d='M90.2,444.0 L90.2,317.6 L100.9,317.6 L100.9,444.0 L90.2,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '111.5,444.0 122.3,444.0 122.3,85.7 111.5,85.7 '/>
+	</g>
+	<path stroke='red'  d='M111.5,444.0 L111.5,85.8 L122.2,85.8 L122.2,444.0 L111.5,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '132.9,444.0 143.6,444.0 143.6,254.2 132.9,254.2 '/>
+	</g>
+	<path stroke='red'  d='M132.9,444.0 L132.9,254.3 L143.5,254.3 L143.5,444.0 L132.9,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '196.8,444.0 207.5,444.0 207.5,422.8 196.8,422.8 '/>
+	</g>
+	<path stroke='red'  d='M196.8,444.0 L196.8,422.9 L207.4,422.9 L207.4,444.0 L196.8,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '218.1,444.0 228.8,444.0 228.8,359.6 218.1,359.6 '/>
+	</g>
+	<path stroke='red'  d='M218.1,444.0 L218.1,359.7 L228.7,359.7 L228.7,444.0 L218.1,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '239.4,444.0 250.1,444.0 250.1,275.3 239.4,275.3 '/>
+	</g>
+	<path stroke='red'  d='M239.4,444.0 L239.4,275.4 L250.0,275.4 L250.0,444.0 L239.4,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '260.7,444.0 271.5,444.0 271.5,317.5 260.7,317.5 '/>
+	</g>
+	<path stroke='red'  d='M260.7,444.0 L260.7,317.6 L271.4,317.6 L271.4,444.0 L260.7,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '303.3,444.0 314.1,444.0 314.1,359.6 303.3,359.6 '/>
+	</g>
+	<path stroke='red'  d='M303.3,444.0 L303.3,359.7 L314.0,359.7 L314.0,444.0 L303.3,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '324.6,444.0 335.4,444.0 335.4,148.9 324.6,148.9 '/>
+	</g>
+	<path stroke='red'  d='M324.6,444.0 L324.6,149.0 L335.3,149.0 L335.3,444.0 L324.6,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '345.9,444.0 356.7,444.0 356.7,233.2 345.9,233.2 '/>
+	</g>
+	<path stroke='red'  d='M345.9,444.0 L345.9,233.3 L356.6,233.3 L356.6,444.0 L345.9,444.0 Z  h0.01'/>	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '367.2,444.0 378.0,444.0 378.0,106.7 367.2,106.7 '/>
+	</g>
+	<path stroke='red'  d='M367.2,444.0 L367.2,106.8 L377.9,106.8 L377.9,444.0 L367.2,444.0 Z  h0.01'/></g>
+	</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M63.6,64.7 L63.6,444.0 L575.0,444.0 L575.0,64.7 L63.6,64.7 Z  h0.01'/></g>
+</g>
+</svg>
+
diff --git a/statistics/trustie2/trustie/index.html b/statistics/trustie2/trustie/index.html
new file mode 100644
index 000000000..c37a29fbd
--- /dev/null
+++ b/statistics/trustie2/trustie/index.html
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<!--<title>GitStats - trustie2</title>-->
+	<link rel="stylesheet" href="gitstats.css" type="text/css" />
+	<meta name="generator" content="GitStats " />
+	<script type="text/javascript" src="sortable.js"></script>
+</head>
+<body>
+
+<div class="nav">
+<ul>
+<li><a href="index.html">一般(General)</a></li>
+<li><a href="activity.html">活动(Activity)</a></li>
+<li><a href="authors.html">作者(Authors)</a></li>
+<li><a href="files.html">文件(Files)</a></li>
+<li><a href="tags.html">里程碑(Tags)</a></li>
+</ul>
+</div>
+<dl><dt>项目名(Project name)</dt><dd>trustie2</dd><dt>生成时间(Generated)</dt><dd>2013-08-19 17:17:34 (in 0 seconds)</dd><dt>统计时段(Report Period)</dt><dd>2013-08-01 02:33:49 to 2013-08-09 09:24:38</dd><dt>项目年龄(Age)</dt><dd>9 days, 9 active days (100.00%)</dd><dt>文件总数(Total files)</dt><dd>1848</dd><dt>代码总数(Total Lines of Code)</dt><dd>193300</dd><dt>修改代码总数(Total Modified Lines of Code)</dt><dd>3197 (5961 added, 2764 removed)</dd><dt>提交总数(Total Commits)</dt><dd>101 (average 11.2 commits per active day, 11.2 per all days)</dd><dt>作者总数(Authors)</dt><dd>7</dd></dl></body>
+</html>
\ No newline at end of file
diff --git a/statistics/trustie2/trustie/lines.html b/statistics/trustie2/trustie/lines.html
new file mode 100644
index 000000000..0c5f5abcf
--- /dev/null
+++ b/statistics/trustie2/trustie/lines.html
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<!--<title>GitStats - trustie2</title>-->
+	<link rel="stylesheet" href="gitstats.css" type="text/css" />
+	<meta name="generator" content="GitStats " />
+	<script type="text/javascript" src="sortable.js"></script>
+</head>
+<body>
+
+<div class="nav">
+<ul>
+<li><a href="index.html">一般(General)</a></li>
+<li><a href="activity.html">活动(Activity)</a></li>
+<li><a href="authors.html">作者(Authors)</a></li>
+<li><a href="files.html">文件(Files)</a></li>
+<li><a href="tags.html">里程碑(Tags)</a></li>
+</ul>
+</div>
+<dl>
+<dt>Total lines</dt><dd>3197</dd></dl>
+
+<h2><a href="#lines_of_code" name="lines_of_code">Lines of Code</a></h2>
+
+<img src="lines_of_code.svg" /></body></html>
\ No newline at end of file
diff --git a/statistics/trustie2/trustie/lines_of_code.dat b/statistics/trustie2/trustie/lines_of_code.dat
new file mode 100644
index 000000000..2329820b3
--- /dev/null
+++ b/statistics/trustie2/trustie/lines_of_code.dat
@@ -0,0 +1,101 @@
+1375324429 0
+1375325261 0
+1375325513 0
+1375326539 5
+1375348247 17
+1375357090 22
+1375357126 22
+1375357950 -8
+1375359056 -10
+1375359979 300
+1375360034 300
+1375360370 300
+1375360399 307
+1375360718 314
+1375360773 314
+1375361220 370
+1375361969 370
+1375363600 367
+1375364197 374
+1375364231 374
+1375364851 374
+1375365286 374
+1375367130 374
+1375367154 374
+1375404304 374
+1375404787 428
+1375404847 428
+1375411272 468
+1375412616 477
+1375520088 542
+1375530129 545
+1375531744 552
+1375533998 552
+1375537672 560
+1375538767 560
+1375539510 562
+1375539737 635
+1375541502 701
+1375577739 702
+1375577875 702
+1375578771 702
+1375580252 697
+1375582298 721
+1375585016 769
+1375585165 784
+1375585710 786
+1375586586 786
+1375597392 787
+1375663459 792
+1375672793 928
+1375710068 953
+1375714021 1031
+1375755135 1031
+1375755411 1022
+1375755682 1022
+1375757597 1022
+1375775588 1065
+1375776534 1066
+1375777957 1053
+1375778683 1065
+1375790992 1072
+1375793734 1072
+1375793858 1084
+1375794491 1086
+1375796586 1217
+1375799002 1217
+1375799212 1304
+1375838465 1305
+1375840139 1305
+1375846140 1327
+1375860564 1316
+1375863871 1316
+1375865104 1479
+1375866365 1482
+1375866864 1482
+1375881037 1511
+1375884832 1511
+1375885356 1511
+1375925934 1521
+1375927484 1562
+1375927618 1562
+1375952516 2981
+1375953997 2954
+1375971555 3045
+1375971932 3076
+1375972006 3169
+1375972025 3169
+1375972078 3195
+1376013008 3212
+1376013984 3197
+1376014860 3143
+1376015554 3128
+1376016127 3130
+1376017691 3130
+1376018093 3145
+1376018682 3145
+1376031773 3147
+1376032117 3147
+1376036786 3176
+1376037020 3197
+1376040278 3197
diff --git a/statistics/trustie2/trustie/lines_of_code.plot b/statistics/trustie2/trustie/lines_of_code.plot
new file mode 100644
index 000000000..6737f9e8a
--- /dev/null
+++ b/statistics/trustie2/trustie/lines_of_code.plot
@@ -0,0 +1,13 @@
+set terminal svg 
+set size 1.0,0.9
+
+set output 'lines_of_code.svg'
+unset key
+set xdata time
+set timefmt "%s"
+set format x "%Y-%m-%d"
+set grid y
+set ylabel "Lines"
+set xtics rotate by 90
+set bmargin 6
+plot 'lines_of_code.dat' using 1:2 w lines
diff --git a/statistics/trustie2/trustie/lines_of_code.svg b/statistics/trustie2/trustie/lines_of_code.svg
new file mode 100644
index 000000000..87a8216c0
--- /dev/null
+++ b/statistics/trustie2/trustie/lines_of_code.svg
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"  standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg 
+ width="600" height="480" 
+ viewBox="0 0 600 480"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+
+<title>Gnuplot</title>
+<desc>Produced by GNUPLOT 4.6 patchlevel 3 </desc>
+
+<g id="gnuplot_canvas">
+
+<rect x="0" y="0" width="600" height="480" fill="none"/>
+<defs>
+
+	<circle id='gpDot' r='0.5' stroke-width='0.5'/>
+	<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
+	<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
+	<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
+	<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
+	<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
+	<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
+	<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
+	<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
+	<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
+</defs>
+<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,372.0 L575.0,372.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,372.0 L89.2,372.0 M575.0,372.0 L566.0,372.0  h0.01'/>	<g transform="translate(71.9,376.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text>-500</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,333.6 L575.0,333.6  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,333.6 L89.2,333.6 M575.0,333.6 L566.0,333.6  h0.01'/>	<g transform="translate(71.9,338.1)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 0</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,295.2 L575.0,295.2  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,295.2 L89.2,295.2 M575.0,295.2 L566.0,295.2  h0.01'/>	<g transform="translate(71.9,299.7)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 500</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,256.8 L575.0,256.8  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,256.8 L89.2,256.8 M575.0,256.8 L566.0,256.8  h0.01'/>	<g transform="translate(71.9,261.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1000</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,218.3 L575.0,218.3  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,218.3 L89.2,218.3 M575.0,218.3 L566.0,218.3  h0.01'/>	<g transform="translate(71.9,222.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 1500</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,179.9 L575.0,179.9  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,179.9 L89.2,179.9 M575.0,179.9 L566.0,179.9  h0.01'/>	<g transform="translate(71.9,184.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 2000</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,141.5 L575.0,141.5  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,141.5 L89.2,141.5 M575.0,141.5 L566.0,141.5  h0.01'/>	<g transform="translate(71.9,146.0)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 2500</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,103.1 L575.0,103.1  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,103.1 L89.2,103.1 M575.0,103.1 L566.0,103.1  h0.01'/>	<g transform="translate(71.9,107.6)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 3000</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M80.2,64.7 L575.0,64.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,64.7 L89.2,64.7 M575.0,64.7 L566.0,64.7  h0.01'/>	<g transform="translate(71.9,69.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 3500</text>
+	</g>
+	<path stroke='black'  d='M80.2,372.0 L80.2,363.0 M80.2,64.7 L80.2,73.7  h0.01'/>	<g transform="translate(84.7,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-01</text>
+	</g>
+	<path stroke='black'  d='M93.9,372.0 L93.9,367.5 M93.9,64.7 L93.9,69.2 M107.7,372.0 L107.7,367.5 M107.7,64.7 L107.7,69.2 
+		M121.4,372.0 L121.4,367.5 M121.4,64.7 L121.4,69.2 M135.2,372.0 L135.2,363.0 M135.2,64.7 L135.2,73.7 
+		 h0.01'/>	<g transform="translate(139.7,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-02</text>
+	</g>
+	<path stroke='black'  d='M148.9,372.0 L148.9,367.5 M148.9,64.7 L148.9,69.2 M162.7,372.0 L162.7,367.5 M162.7,64.7 L162.7,69.2 
+		M176.4,372.0 L176.4,367.5 M176.4,64.7 L176.4,69.2 M190.2,372.0 L190.2,363.0 M190.2,64.7 L190.2,73.7 
+		 h0.01'/>	<g transform="translate(194.7,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-03</text>
+	</g>
+	<path stroke='black'  d='M203.9,372.0 L203.9,367.5 M203.9,64.7 L203.9,69.2 M217.6,372.0 L217.6,367.5 M217.6,64.7 L217.6,69.2 
+		M231.4,372.0 L231.4,367.5 M231.4,64.7 L231.4,69.2 M245.1,372.0 L245.1,363.0 M245.1,64.7 L245.1,73.7 
+		 h0.01'/>	<g transform="translate(249.6,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-04</text>
+	</g>
+	<path stroke='black'  d='M258.9,372.0 L258.9,367.5 M258.9,64.7 L258.9,69.2 M272.6,372.0 L272.6,367.5 M272.6,64.7 L272.6,69.2 
+		M286.4,372.0 L286.4,367.5 M286.4,64.7 L286.4,69.2 M300.1,372.0 L300.1,363.0 M300.1,64.7 L300.1,73.7 
+		 h0.01'/>	<g transform="translate(304.6,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-05</text>
+	</g>
+	<path stroke='black'  d='M313.9,372.0 L313.9,367.5 M313.9,64.7 L313.9,69.2 M327.6,372.0 L327.6,367.5 M327.6,64.7 L327.6,69.2 
+		M341.3,372.0 L341.3,367.5 M341.3,64.7 L341.3,69.2 M355.1,372.0 L355.1,363.0 M355.1,64.7 L355.1,73.7 
+		 h0.01'/>	<g transform="translate(359.6,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-06</text>
+	</g>
+	<path stroke='black'  d='M368.8,372.0 L368.8,367.5 M368.8,64.7 L368.8,69.2 M382.6,372.0 L382.6,367.5 M382.6,64.7 L382.6,69.2 
+		M396.3,372.0 L396.3,367.5 M396.3,64.7 L396.3,69.2 M410.1,372.0 L410.1,363.0 M410.1,64.7 L410.1,73.7 
+		 h0.01'/>	<g transform="translate(414.6,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-07</text>
+	</g>
+	<path stroke='black'  d='M423.8,372.0 L423.8,367.5 M423.8,64.7 L423.8,69.2 M437.6,372.0 L437.6,367.5 M437.6,64.7 L437.6,69.2 
+		M451.3,372.0 L451.3,367.5 M451.3,64.7 L451.3,69.2 M465.0,372.0 L465.0,363.0 M465.0,64.7 L465.0,73.7 
+		 h0.01'/>	<g transform="translate(469.5,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-08</text>
+	</g>
+	<path stroke='black'  d='M478.8,372.0 L478.8,367.5 M478.8,64.7 L478.8,69.2 M492.5,372.0 L492.5,367.5 M492.5,64.7 L492.5,69.2 
+		M506.3,372.0 L506.3,367.5 M506.3,64.7 L506.3,69.2 M520.0,372.0 L520.0,363.0 M520.0,64.7 L520.0,73.7 
+		 h0.01'/>	<g transform="translate(524.5,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-09</text>
+	</g>
+	<path stroke='black'  d='M533.8,372.0 L533.8,367.5 M533.8,64.7 L533.8,69.2 M547.5,372.0 L547.5,367.5 M547.5,64.7 L547.5,69.2 
+		M561.3,372.0 L561.3,367.5 M561.3,64.7 L561.3,69.2 M575.0,372.0 L575.0,363.0 M575.0,64.7 L575.0,73.7 
+		 h0.01'/>	<g transform="translate(579.5,380.3) rotate(-90)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:start">
+		<text>2013-08-10</text>
+	</g>
+	<path stroke='black'  d='M80.2,64.7 L80.2,372.0 L575.0,372.0 L575.0,64.7 L80.2,64.7 Z  h0.01'/>	<g transform="translate(17.6,218.4) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>Lines</text>
+	</g>
+</g>
+	<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
+<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='red'  d='M86.1,333.6 L86.6,333.6 L86.8,333.6 L87.4,333.2 L101.2,332.3 L106.9,331.9 L107.4,334.2 L108.1,334.4 
+		L108.7,310.5 L108.9,310.5 L109.0,310.0 L109.2,309.5 L109.5,305.2 L110.0,305.2 L111.0,305.4 L111.4,304.9 
+		L111.8,304.9 L112.1,304.9 L113.2,304.9 L113.3,304.9 L136.9,304.9 L137.2,300.7 L141.3,297.6 L142.2,296.9 
+		L210.6,291.9 L217.0,291.7 L218.0,291.2 L219.4,291.2 L221.8,290.6 L222.5,290.6 L222.9,290.4 L223.1,284.8 
+		L224.2,279.7 L247.3,279.7 L247.9,279.7 L248.9,280.0 L250.2,278.2 L251.9,274.5 L252.0,273.4 L252.3,273.2 
+		L252.9,273.2 L259.8,273.1 L301.8,272.7 L307.7,262.3 L331.5,260.4 L334.0,254.4 L360.1,254.4 L360.3,255.1 
+		L360.5,255.1 L361.7,255.1 L373.2,251.8 L373.8,251.7 L374.7,252.7 L375.1,251.8 L383.0,251.2 L384.7,251.2 
+		L384.8,250.3 L385.2,250.2 L386.5,240.1 L388.1,240.1 L388.2,233.4 L413.2,233.3 L414.2,233.3 L418.0,231.6 
+		L427.2,232.5 L429.3,232.5 L430.1,220.0 L430.9,219.7 L431.2,219.7 L440.3,217.5 L442.7,217.5 L443.0,217.5 
+		L468.8,216.7 L469.8,213.6 L469.9,213.6 L485.7,104.6 L486.7,106.6 L497.8,99.7 L498.1,97.3 L498.1,90.1 
+		L498.2,88.1 L524.2,86.8 L524.8,88.0 L525.4,92.1 L525.8,93.3 L526.2,93.1 L527.2,93.1 L527.5,92.0 
+		L527.8,92.0 L536.2,91.8 L536.4,91.8 L539.4,89.6 L539.5,88.0 L541.6,88.0  h0.01'/></g>
+	</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M80.2,64.7 L80.2,372.0 L575.0,372.0 L575.0,64.7 L80.2,64.7 Z  h0.01'/></g>
+</g>
+</svg>
+
diff --git a/statistics/trustie2/trustie/month_of_year.dat b/statistics/trustie2/trustie/month_of_year.dat
new file mode 100644
index 000000000..db65ab734
--- /dev/null
+++ b/statistics/trustie2/trustie/month_of_year.dat
@@ -0,0 +1,12 @@
+1 0
+2 0
+3 0
+4 0
+5 0
+6 0
+7 0
+8 101
+9 0
+10 0
+11 0
+12 0
diff --git a/statistics/trustie2/trustie/month_of_year.plot b/statistics/trustie2/trustie/month_of_year.plot
new file mode 100644
index 000000000..0ad60313e
--- /dev/null
+++ b/statistics/trustie2/trustie/month_of_year.plot
@@ -0,0 +1,10 @@
+set terminal svg 
+set size 1.0,0.9
+
+set output 'month_of_year.svg'
+unset key
+set xrange [0.5:12.5]
+set xtics 1
+set grid y
+set ylabel "Commits"
+plot 'month_of_year.dat' using 1:2:(0.5) w boxes fs solid
diff --git a/statistics/trustie2/trustie/month_of_year.svg b/statistics/trustie2/trustie/month_of_year.svg
new file mode 100644
index 000000000..4f5ca8aad
--- /dev/null
+++ b/statistics/trustie2/trustie/month_of_year.svg
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"  standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg 
+ width="600" height="480" 
+ viewBox="0 0 600 480"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+>
+
+<title>Gnuplot</title>
+<desc>Produced by GNUPLOT 4.6 patchlevel 3 </desc>
+
+<g id="gnuplot_canvas">
+
+<rect x="0" y="0" width="600" height="480" fill="none"/>
+<defs>
+
+	<circle id='gpDot' r='0.5' stroke-width='0.5'/>
+	<path id='gpPt0' stroke-width='0.222' stroke='currentColor' d='M-1,0 h2 M0,-1 v2'/>
+	<path id='gpPt1' stroke-width='0.222' stroke='currentColor' d='M-1,-1 L1,1 M1,-1 L-1,1'/>
+	<path id='gpPt2' stroke-width='0.222' stroke='currentColor' d='M-1,0 L1,0 M0,-1 L0,1 M-1,-1 L1,1 M-1,1 L1,-1'/>
+	<rect id='gpPt3' stroke-width='0.222' stroke='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<rect id='gpPt4' stroke-width='0.222' stroke='currentColor' fill='currentColor' x='-1' y='-1' width='2' height='2'/>
+	<circle id='gpPt5' stroke-width='0.222' stroke='currentColor' cx='0' cy='0' r='1'/>
+	<use xlink:href='#gpPt5' id='gpPt6' fill='currentColor' stroke='none'/>
+	<path id='gpPt7' stroke-width='0.222' stroke='currentColor' d='M0,-1.33 L-1.33,0.67 L1.33,0.67 z'/>
+	<use xlink:href='#gpPt7' id='gpPt8' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt7' id='gpPt9' stroke='currentColor' transform='rotate(180)'/>
+	<use xlink:href='#gpPt9' id='gpPt10' fill='currentColor' stroke='none'/>
+	<use xlink:href='#gpPt3' id='gpPt11' stroke='currentColor' transform='rotate(45)'/>
+	<use xlink:href='#gpPt11' id='gpPt12' fill='currentColor' stroke='none'/>
+</defs>
+<g style="fill:none; color:white; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,444.0 L575.0,444.0  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,444.0 L80.9,444.0 M575.0,444.0 L566.0,444.0  h0.01'/>	<g transform="translate(63.6,448.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 0</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,380.8 L575.0,380.8  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,380.8 L80.9,380.8 M575.0,380.8 L566.0,380.8  h0.01'/>	<g transform="translate(63.6,385.3)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 20</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,317.6 L575.0,317.6  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,317.6 L80.9,317.6 M575.0,317.6 L566.0,317.6  h0.01'/>	<g transform="translate(63.6,322.1)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 40</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,254.3 L575.0,254.3  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,254.3 L80.9,254.3 M575.0,254.3 L566.0,254.3  h0.01'/>	<g transform="translate(63.6,258.8)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 60</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,191.1 L575.0,191.1  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,191.1 L80.9,191.1 M575.0,191.1 L566.0,191.1  h0.01'/>	<g transform="translate(63.6,195.6)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 80</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,127.9 L575.0,127.9  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,127.9 L80.9,127.9 M575.0,127.9 L566.0,127.9  h0.01'/>	<g transform="translate(63.6,132.4)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 100</text>
+	</g>
+</g>
+<g style="fill:none; color:gray; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='gray' stroke-dasharray=' 2,4' class="gridline"  d='M71.9,64.7 L575.0,64.7  h0.01'/></g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,64.7 L80.9,64.7 M575.0,64.7 L566.0,64.7  h0.01'/>	<g transform="translate(63.6,69.2)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:end">
+		<text> 120</text>
+	</g>
+	<path stroke='black'  d='M92.9,444.0 L92.9,435.0 M92.9,64.7 L92.9,73.7  h0.01'/>	<g transform="translate(92.9,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 1</text>
+	</g>
+	<path stroke='black'  d='M134.8,444.0 L134.8,435.0 M134.8,64.7 L134.8,73.7  h0.01'/>	<g transform="translate(134.8,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 2</text>
+	</g>
+	<path stroke='black'  d='M176.7,444.0 L176.7,435.0 M176.7,64.7 L176.7,73.7  h0.01'/>	<g transform="translate(176.7,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 3</text>
+	</g>
+	<path stroke='black'  d='M218.6,444.0 L218.6,435.0 M218.6,64.7 L218.6,73.7  h0.01'/>	<g transform="translate(218.6,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 4</text>
+	</g>
+	<path stroke='black'  d='M260.6,444.0 L260.6,435.0 M260.6,64.7 L260.6,73.7  h0.01'/>	<g transform="translate(260.6,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 5</text>
+	</g>
+	<path stroke='black'  d='M302.5,444.0 L302.5,435.0 M302.5,64.7 L302.5,73.7  h0.01'/>	<g transform="translate(302.5,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 6</text>
+	</g>
+	<path stroke='black'  d='M344.4,444.0 L344.4,435.0 M344.4,64.7 L344.4,73.7  h0.01'/>	<g transform="translate(344.4,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 7</text>
+	</g>
+	<path stroke='black'  d='M386.3,444.0 L386.3,435.0 M386.3,64.7 L386.3,73.7  h0.01'/>	<g transform="translate(386.3,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 8</text>
+	</g>
+	<path stroke='black'  d='M428.3,444.0 L428.3,435.0 M428.3,64.7 L428.3,73.7  h0.01'/>	<g transform="translate(428.3,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 9</text>
+	</g>
+	<path stroke='black'  d='M470.2,444.0 L470.2,435.0 M470.2,64.7 L470.2,73.7  h0.01'/>	<g transform="translate(470.2,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 10</text>
+	</g>
+	<path stroke='black'  d='M512.1,444.0 L512.1,435.0 M512.1,64.7 L512.1,73.7  h0.01'/>	<g transform="translate(512.1,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 11</text>
+	</g>
+	<path stroke='black'  d='M554.0,444.0 L554.0,435.0 M554.0,64.7 L554.0,73.7  h0.01'/>	<g transform="translate(554.0,466.5)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text> 12</text>
+	</g>
+	<path stroke='black'  d='M71.9,64.7 L71.9,444.0 L575.0,444.0 L575.0,64.7 L71.9,64.7 Z  h0.01'/>	<g transform="translate(17.6,254.4) rotate(270)" style="stroke:none; fill:black; font-family:Arial; font-size:12.00pt; text-anchor:middle">
+		<text>Commits</text>
+	</g>
+</g>
+	<g id="gnuplot_plot_1" ><title>gnuplot_plot_1</title>
+<g style="fill:none; color:red; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<g style = 'stroke:none; shape-rendering:crispEdges'>
+		<polygon fill = 'red' points = '375.9,444.0 396.9,444.0 396.9,124.7 375.9,124.7 '/>
+	</g>
+	<path stroke='red'  d='M375.9,444.0 L375.9,124.8 L396.8,124.8 L396.8,444.0 L375.9,444.0 Z  h0.01'/></g>
+	</g>
+<g style="fill:none; color:black; stroke:currentColor; stroke-width:1.00; stroke-linecap:butt; stroke-linejoin:miter">
+	<path stroke='black'  d='M71.9,64.7 L71.9,444.0 L575.0,444.0 L575.0,64.7 L71.9,64.7 Z  h0.01'/></g>
+</g>
+</svg>
+
diff --git a/statistics/trustie2/trustie/sortable.js b/statistics/trustie2/trustie/sortable.js
new file mode 100644
index 000000000..89477324a
--- /dev/null
+++ b/statistics/trustie2/trustie/sortable.js
@@ -0,0 +1,324 @@
+/*
+Table sorting script  by Joost de Valk, check it out at http://www.joostdevalk.nl/code/sortable-table/.
+Based on a script from http://www.kryogenix.org/code/browser/sorttable/.
+Distributed under the MIT license: http://www.kryogenix.org/code/browser/licence.html .
+
+Copyright (c) 1997-2007 Stuart Langridge, Joost de Valk.
+
+Version 1.5.7
+*/
+
+/* You can change these values */
+var image_path = "";
+var image_up = "arrow-up.gif";
+var image_down = "arrow-down.gif";
+var image_none = "arrow-none.gif";
+var europeandate = true;
+var alternate_row_colors = true;
+
+/* Don't change anything below this unless you know what you're doing */
+addEvent(window, "load", sortables_init);
+
+var SORT_COLUMN_INDEX;
+var thead = false;
+
+function sortables_init() {
+	// Find all tables with class sortable and make them sortable
+	if (!document.getElementsByTagName) return;
+	tbls = document.getElementsByTagName("table");
+	for (ti=0;ti<tbls.length;ti++) {
+		thisTbl = tbls[ti];
+		if (((' '+thisTbl.className+' ').indexOf("sortable") != -1) && (thisTbl.id)) {
+			ts_makeSortable(thisTbl);
+		}
+	}
+}
+
+function ts_makeSortable(t) {
+	if (t.rows && t.rows.length > 0) {
+		if (t.tHead && t.tHead.rows.length > 0) {
+			var firstRow = t.tHead.rows[t.tHead.rows.length-1];
+			thead = true;
+		} else {
+			var firstRow = t.rows[0];
+		}
+	}
+	if (!firstRow) return;
+	
+	// We have a first row: assume it's the header, and make its contents clickable links
+	for (var i=0;i<firstRow.cells.length;i++) {
+		var cell = firstRow.cells[i];
+		var txt = ts_getInnerText(cell);
+		if (cell.className != "unsortable" && cell.className.indexOf("unsortable") == -1) {
+			cell.innerHTML = '<a href="#" class="sortheader" onclick="ts_resortTable(this, '+i+');return false;">'+txt+'<span class="sortarrow">&nbsp;&nbsp;<img src="'+ image_path + image_none + '" alt="&darr;"/></span></a>';
+		}
+	}
+	if (alternate_row_colors) {
+		alternate(t);
+	}
+}
+
+function ts_getInnerText(el) {
+	if (typeof el == "string") return el;
+	if (typeof el == "undefined") { return el };
+	if (el.innerText) return el.innerText;	//Not needed but it is faster
+	var str = "";
+	
+	var cs = el.childNodes;
+	var l = cs.length;
+	for (var i = 0; i < l; i++) {
+		switch (cs[i].nodeType) {
+			case 1: //ELEMENT_NODE
+				str += ts_getInnerText(cs[i]);
+				break;
+			case 3:	//TEXT_NODE
+				str += cs[i].nodeValue;
+				break;
+		}
+	}
+	return str;
+}
+
+function ts_resortTable(lnk, clid) {
+	var span;
+	for (var ci=0;ci<lnk.childNodes.length;ci++) {
+		if (lnk.childNodes[ci].tagName && lnk.childNodes[ci].tagName.toLowerCase() == 'span') span = lnk.childNodes[ci];
+	}
+	var spantext = ts_getInnerText(span);
+	var td = lnk.parentNode;
+	var column = clid || td.cellIndex;
+	var t = getParent(td,'TABLE');
+	// Work out a type for the column
+	if (t.rows.length <= 1) return;
+	var itm = "";
+	var i = 1;
+	while (itm == "" && i < t.tBodies[0].rows.length) {
+		var itm = ts_getInnerText(t.tBodies[0].rows[i].cells[column]);
+		itm = trim(itm);
+		if (itm.substr(0,4) == "<!--" || itm.length == 0) {
+			itm = "";
+		}
+		i++;
+	}
+	if (itm == "") return; 
+	sortfn = ts_sort_caseinsensitive;
+	if (itm.match(/^\d\d[\/\.-][a-zA-z][a-zA-Z][a-zA-Z][\/\.-]\d\d\d\d$/)) sortfn = ts_sort_date;
+	if (itm.match(/^\d\d[\/\.-]\d\d[\/\.-]\d\d\d{2}?$/)) sortfn = ts_sort_date;
+	if (itm.match(/^-?[�$�ۢ�]\d/)) sortfn = ts_sort_numeric;
+	// ignore stuff in () after the numbers.
+	if (itm.match(/^-?(\d+[,\.]?)+(E[-+][\d]+)?%?( \(.*\))?$/)) sortfn = ts_sort_numeric;
+	SORT_COLUMN_INDEX = column;
+	var firstRow = new Array();
+	var newRows = new Array();
+	for (k=0;k<t.tBodies.length;k++) {
+		for (i=0;i<t.tBodies[k].rows[0].length;i++) { 
+			firstRow[i] = t.tBodies[k].rows[0][i]; 
+		}
+	}
+	for (k=0;k<t.tBodies.length;k++) {
+		if (!thead) {
+			// Skip the first row
+			for (j=1;j<t.tBodies[k].rows.length;j++) { 
+				newRows[j-1] = t.tBodies[k].rows[j];
+			}
+		} else {
+			// Do NOT skip the first row
+			for (j=0;j<t.tBodies[k].rows.length;j++) { 
+				newRows[j] = t.tBodies[k].rows[j];
+			}
+		}
+	}
+	newRows.sort(sortfn);
+	if (span.getAttribute("sortdir") == 'down') {
+			ARROW = '&nbsp;&nbsp;<img src="'+ image_path + image_down + '" alt="&darr;"/>';
+			newRows.reverse();
+			span.setAttribute('sortdir','up');
+	} else {
+			ARROW = '&nbsp;&nbsp;<img src="'+ image_path + image_up + '" alt="&uarr;"/>';
+			span.setAttribute('sortdir','down');
+	} 
+    // We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones
+    // don't do sortbottom rows
+    for (i=0; i<newRows.length; i++) { 
+		if (!newRows[i].className || (newRows[i].className && (newRows[i].className.indexOf('sortbottom') == -1))) {
+			t.tBodies[0].appendChild(newRows[i]);
+		}
+	}
+    // do sortbottom rows only
+    for (i=0; i<newRows.length; i++) {
+		if (newRows[i].className && (newRows[i].className.indexOf('sortbottom') != -1)) 
+			t.tBodies[0].appendChild(newRows[i]);
+	}
+	// Delete any other arrows there may be showing
+	var allspans = document.getElementsByTagName("span");
+	for (var ci=0;ci<allspans.length;ci++) {
+		if (allspans[ci].className == 'sortarrow') {
+			if (getParent(allspans[ci],"table") == getParent(lnk,"table")) { // in the same table as us?
+				allspans[ci].innerHTML = '&nbsp;&nbsp;<img src="'+ image_path + image_none + '" alt="&darr;"/>';
+			}
+		}
+	}		
+	span.innerHTML = ARROW;
+	alternate(t);
+}
+
+function getParent(el, pTagName) {
+	if (el == null) {
+		return null;
+	} else if (el.nodeType == 1 && el.tagName.toLowerCase() == pTagName.toLowerCase()) {
+		return el;
+	} else {
+		return getParent(el.parentNode, pTagName);
+	}
+}
+
+function sort_date(date) {	
+	// y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX
+	dt = "00000000";
+	if (date.length == 11) {
+		mtstr = date.substr(3,3);
+		mtstr = mtstr.toLowerCase();
+		switch(mtstr) {
+			case "jan": var mt = "01"; break;
+			case "feb": var mt = "02"; break;
+			case "mar": var mt = "03"; break;
+			case "apr": var mt = "04"; break;
+			case "may": var mt = "05"; break;
+			case "jun": var mt = "06"; break;
+			case "jul": var mt = "07"; break;
+			case "aug": var mt = "08"; break;
+			case "sep": var mt = "09"; break;
+			case "oct": var mt = "10"; break;
+			case "nov": var mt = "11"; break;
+			case "dec": var mt = "12"; break;
+			// default: var mt = "00";
+		}
+		dt = date.substr(7,4)+mt+date.substr(0,2);
+		return dt;
+	} else if (date.length == 10) {
+		if (europeandate == false) {
+			dt = date.substr(6,4)+date.substr(0,2)+date.substr(3,2);
+			return dt;
+		} else {
+			dt = date.substr(6,4)+date.substr(3,2)+date.substr(0,2);
+			return dt;
+		}
+	} else if (date.length == 8) {
+		yr = date.substr(6,2);
+		if (parseInt(yr) < 50) { 
+			yr = '20'+yr; 
+		} else { 
+			yr = '19'+yr; 
+		}
+		if (europeandate == true) {
+			dt = yr+date.substr(3,2)+date.substr(0,2);
+			return dt;
+		} else {
+			dt = yr+date.substr(0,2)+date.substr(3,2);
+			return dt;
+		}
+	}
+	return dt;
+}
+
+function ts_sort_date(a,b) {
+	dt1 = sort_date(ts_getInnerText(a.cells[SORT_COLUMN_INDEX]));
+	dt2 = sort_date(ts_getInnerText(b.cells[SORT_COLUMN_INDEX]));
+	
+	if (dt1==dt2) {
+		return 0;
+	}
+	if (dt1<dt2) { 
+		return -1;
+	}
+	return 1;
+}
+function ts_sort_numeric(a,b) {
+	var aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
+	aa = clean_num(aa);
+	var bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
+	bb = clean_num(bb);
+	return compare_numeric(aa,bb);
+}
+function compare_numeric(a,b) {
+	var a = parseFloat(a);
+	a = (isNaN(a) ? 0 : a);
+	var b = parseFloat(b);
+	b = (isNaN(b) ? 0 : b);
+	return a - b;
+}
+function ts_sort_caseinsensitive(a,b) {
+	aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]).toLowerCase();
+	bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]).toLowerCase();
+	if (aa==bb) {
+		return 0;
+	}
+	if (aa<bb) {
+		return -1;
+	}
+	return 1;
+}
+function ts_sort_default(a,b) {
+	aa = ts_getInnerText(a.cells[SORT_COLUMN_INDEX]);
+	bb = ts_getInnerText(b.cells[SORT_COLUMN_INDEX]);
+	if (aa==bb) {
+		return 0;
+	}
+	if (aa<bb) {
+		return -1;
+	}
+	return 1;
+}
+function addEvent(elm, evType, fn, useCapture)
+// addEvent and removeEvent
+// cross-browser event handling for IE5+,	NS6 and Mozilla
+// By Scott Andrew
+{
+	if (elm.addEventListener){
+		elm.addEventListener(evType, fn, useCapture);
+		return true;
+	} else if (elm.attachEvent){
+		var r = elm.attachEvent("on"+evType, fn);
+		return r;
+	} else {
+		alert("Handler could not be removed");
+	}
+}
+function clean_num(str) {
+	str = str.replace(new RegExp(/[^-?0-9.]/g),"");
+	return str;
+}
+function trim(s) {
+	return s.replace(/^\s+|\s+$/g, "");
+}
+function alternate(table) {
+	// Take object table and get all it's tbodies.
+	var tableBodies = table.getElementsByTagName("tbody");
+	// Loop through these tbodies
+	for (var i = 0; i < tableBodies.length; i++) {
+		// Take the tbody, and get all it's rows
+		var tableRows = tableBodies[i].getElementsByTagName("tr");
+		// Loop through these rows
+		// Start at 1 because we want to leave the heading row untouched
+		for (var j = 0; j < tableRows.length; j++) {
+			// Check if j is even, and apply classes for both possible results
+			if ( (j % 2) == 0  ) {
+				if ( !(tableRows[j].className.indexOf('odd') == -1) ) {
+					tableRows[j].className = tableRows[j].className.replace('odd', 'even');
+				} else {
+					if ( tableRows[j].className.indexOf('even') == -1 ) {
+						tableRows[j].className += " even";
+					}
+				}
+			} else {
+				if ( !(tableRows[j].className.indexOf('even') == -1) ) {
+					tableRows[j].className = tableRows[j].className.replace('even', 'odd');
+				} else {
+					if ( tableRows[j].className.indexOf('odd') == -1 ) {
+						tableRows[j].className += " odd";
+					}
+				}
+			} 
+		}
+	}
+}
diff --git a/statistics/trustie2/trustie/tags.html b/statistics/trustie2/trustie/tags.html
new file mode 100644
index 000000000..a40f64280
--- /dev/null
+++ b/statistics/trustie2/trustie/tags.html
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<!--<title>GitStats - trustie2</title>-->
+	<link rel="stylesheet" href="gitstats.css" type="text/css" />
+	<meta name="generator" content="GitStats " />
+	<script type="text/javascript" src="sortable.js"></script>
+</head>
+<body>
+
+<div class="nav">
+<ul>
+<li><a href="index.html">一般(General)</a></li>
+<li><a href="activity.html">活动(Activity)</a></li>
+<li><a href="authors.html">作者(Authors)</a></li>
+<li><a href="files.html">文件(Files)</a></li>
+<li><a href="tags.html">里程碑(Tags)</a></li>
+</ul>
+</div>
+<dl><dt>Total tags</dt><dd>0</dd></dl><table class="tags"><tr><th>Name</th><th>Date</th><th>Commits</th><th>Authors</th></tr></table></body></html>
\ No newline at end of file