diff --git a/Guardfile b/Guardfile
index 75aa93c15..5c48ddefe 100644
--- a/Guardfile
+++ b/Guardfile
@@ -6,6 +6,7 @@
 # end
 #
 guard 'spork', :test_unit => true, :test_unit_env => {'RAILS_ENV' => 'test'}, :wait => 60 do
+  watch(%r{app/models/.+\.rb})
   watch('config/application.rb')
   watch('config/environment.rb')
   watch('config/environments/test.rb')
diff --git a/ReadMe.txt b/ReadMe.txt
index 2505c295b..c373119fb 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,19 +1,8 @@
-patch: 
-用户姓名的部分，根据issues#655。
-为了修改方便
-alias：
-方法     之前显示            调整之后
-name     firstname+lastname  login
-nickname xxx                 login
-realname xxx                 firstname+lastname
+===================================[2014-04-09]=================================
+kw: 域名, 二级域名, subdomain, forge, course, contest
+域名跳转（forge/course/contest）这几个设置在settings.yml中
+但是跳转在development模式下会导致无法开发
 
-User model经过修改，已经完全集成了user_extensions的功能
-例如
-user.gender=1
-user.save
-user_extensions字段会自动保存
-不必要每次user.user_extensions.xxx以及判断是否为空
-================================================================================
 app/models/setting.rb :165
   # fixed domain url in development. tantantan's bug
   if Rails.env.development?
@@ -23,36 +12,40 @@ app/models/setting.rb :165
   end
   程序部分链接中制定了subdomain参数，使链接在二级域名中来回跳转。
   为了开发方便，使之功能在development模式下失效。 
-  # => nyan
-================================================================================
-app/controller/projects_controller.rb ===> projects#fake
-  fake filter: 修改了传到页面中的Count后缀的数量
-  改为正确的数量，删掉fake过滤器即可
-================================================================================
+
+
+===================================[2014-04-09]=================================
+kw: 菜单, 导航栏, layout
+网页上方的导航条没有用Redmine::MenuManager
+MenuManager的样式无法定制，菜单显示条件if中的proc执行行为没有了解
+
 #导航栏匹配域名显示和改变
 app\helper\application_helper.rb
-# rewrite navigation 
+render_dynamic_nav 方法中，利用变量，可以设置在layout中具体显示哪些条目
 
 app\views\layouts\_base_header.html.erb
-# reset navigation by domain name and url through regular match
-================================================================================
+需要显示的条目，由具体的实例变量设置（在各个layout中）
+
+
+===================================[2014-04-09]=================================
+kw: home_path, 首页, 跳转, 二级域名, welcome
 #首页根据域名匹配进入不同的页面
 app\controller\welcome_controller.rb
-  def entry_select_user
-    if request.original_url.match(/user\.trustie\.net/)
-      redirect_to(:controller => "users", :action => "index")
-      return 0
-    end
-  end
-================================================================================
+#entry_select 放射设置二级域名所显示的首页
 
-================================================================================
-0606：新坑
+
+
+===================================[2014-06-06]=================================
+kw: user_scores
 user_scores表结构有问题，需要运行
 bundle exec rake db:migrate:down VERSION=20140410021724
 bundle exec rake db:migrate:up VERSION=20140410021724
-===============================================================================
-0708：CKEditor插件加载方法
+
+
+
+===================================[2014-07-08]=================================
+kw: CKEditor, 富文本, 编辑器
+CKEditor插件加载方法
 1.把插件文件夹拷入plugins文件夹，确保文件夹名为redmine_ckeditor
 2.运行 bundle install --without development test
 3.运行 rake redmine:plugins:migrate RAILS_ENV=production
@@ -60,8 +53,12 @@ bundle exec rake db:migrate:up VERSION=20140410021724
 5.配置CKEditor插件(Administration > Plugins > Configure)
 6.把文本格式 (Administration > Settings > General > Text formatting)改为CKEditor
 注意：一定要先配置CKEditor插件再见文本格式更改，不然，数据库不会生成对应记录，会报错。。
-===============================================================================
-0719：若遇到首页定制报错问题请尝试如下操作
+
+
+
+===================================[2014-07-19]=================================
+kw: 首页, 定制, forge, course, contest, 排序
+若遇到首页定制报错问题请尝试如下操作
 如果运行迁移文件有报错与‘sort_type’相关 先运行 bundle exec rake db:migrate:down version=20140716021202 bundle exec rake db:migrate:up version=20140716021202
 在按如下步骤执行，未报与之相关的则直接按如下步骤执行
 1.运行 bundle exec rake db:migrate:down version=20140719080032
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4967505a3..b6cd47924 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1703,7 +1703,7 @@ module ApplicationHelper
   def render_dynamic_nav
     home_link = link_to l(:field_homepage), {:controller => 'welcome', :action => 'index'}
     home_link = "<li>" << home_link <<  "</li>"
-    bootstrap_render_dynamic_nav
+    # bootstrap_render_dynamic_nav
     content_tag :ul, (home_link.html_safe+bootstrap_render_dynamic_nav)
   end
 
diff --git a/doc/Automated testing documentation.doc b/doc/Automated testing documentation.doc
index d01506181..8b43c8f3d 100644
Binary files a/doc/Automated testing documentation.doc and b/doc/Automated testing documentation.doc differ
diff --git a/test/unit/course_test.rb b/test/unit/course_test.rb
index a9544fc05..d9cd6d00c 100644
--- a/test/unit/course_test.rb
+++ b/test/unit/course_test.rb
@@ -15,7 +15,6 @@ class CourseTest < ActiveSupport::TestCase
     error_keys = course.errors.keys
 
     valid_attr = [:password, :term, :name, :class_period]
-    puts error_keys
     valid_attr.each do |attr|
       assert(error_keys.include?(attr), "attr unknow: #{attr}")
     end
@@ -43,7 +42,7 @@ class CourseTest < ActiveSupport::TestCase
     course.name = "test_course"
     assert course.valid?
     course.name = name_quirk
-    assert course.valid?
+    assert course.valid?, "Quirk name ===> #{course.name}"
   end
 
   test 'description too long must be valid.(4096)' do