diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 69aae8008..c77ebe704 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -336,4 +336,8 @@ class AdminController < ApplicationController
 
   end
 
+  def create_version
+
+  end
+
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 00af13cb5..5e2f76705 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -443,15 +443,15 @@ class UsersController < ApplicationController
         activity = Activity.where(where_condition).where('user_id in (?)', watcher).order('id desc')
       else
         activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc')
-        activity = activity.reject { |e|
-          !User.current.admin? &&
-              (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) ||
-              (e.act_type == "Bid" && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) ||
-              (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) ||
-              (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) ||
-              (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course)))))
-        }
       end
+      activity = activity.reject { |e|
+        !User.current.admin? &&
+            (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) ||
+                (e.act_type == "Bid" && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) ||
+                (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) ||
+                (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) ||
+                (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course)))))
+      }
       @activity_count = activity.count
       @activity_pages = Paginator.new @activity_count, pre_count, params['page']
       @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page)
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 22b7f8cd3..46b59ef08 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -158,9 +158,9 @@ class CoursesService
 
 
   #显示课程
-  def show_course(params,currnet_user)
+  def show_course(params,current_user)
     course = Course.find(params[:id])
-    unless (course.is_public == 1 ||  currnet_user.member_of_course?(@course)|| currnet_user.admin?)
+    unless (course.is_public == 1 ||  current_user.member_of_course?(course) || current_user.admin?)
       raise '403'
     end
     {:course => course,:img_url => url_to_avatar(course),:current_user_is_member => current_user.member_of_course?(course),:current_user_is_teacher => is_course_teacher(current_user,course)}
diff --git a/app/views/admin/mobile_version.html.erb b/app/views/admin/mobile_version.html.erb
index f8fd4ad6c..293b0ec46 100644
--- a/app/views/admin/mobile_version.html.erb
+++ b/app/views/admin/mobile_version.html.erb
@@ -2,9 +2,8 @@
 <a href="javascript:void(0)" onclick="$('#new_version').slideToggle(400); ">发布新版本</a>
 <div>
   <form id="new_version" style="display: none">
-
+    发布新版本
   </form>
-
 </div>
 <br/>
 <div>当前版本:</div>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 25903f588..9a3b79051 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -45,7 +45,7 @@
     <%= link_to @topic_count,:controller => 'boards',:action => 'index' %>
     个贴子
   </span>
-  <% if @project.enabled_modules.where("name = 'boards'").count > 0 %>
+  <% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %>
     <span>
         <%= link_to l(:label_message_new),
                     new_board_message_path(@board),
diff --git a/app/views/news/_project_news.html.erb b/app/views/news/_project_news.html.erb
index b18c2abd8..a1966ea53 100644
--- a/app/views/news/_project_news.html.erb
+++ b/app/views/news/_project_news.html.erb
@@ -1,3 +1,6 @@
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_news) %></h2>
+</div>
 <script type="text/javascript">
     function regexTitle()
     {
@@ -66,15 +69,11 @@
      label_tips = l(:label_news)
    end
 %>
-
-<span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
-	<%= label_tips %>
-</span>
-<% if @project.enabled_modules.where("name = 'news'").count > 0 %>
-<%= link_to(btn_tips,
-            new_project_news_path(@project),
-            :class => 'icon icon-add',
-            :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
+<% if @project.enabled_modules.where("name = 'news'").count > 0 && User.current.member_of?(@project) %>
+    <%= link_to(btn_tips,
+                new_project_news_path(@project),
+                :class => 'icon icon-add',
+                :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
 <% end %>
 <% if @project && User.current.allowed_to?(:manage_news, @project) %>
     <div id="add-news" class="add_frame" style="display:none;">
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 7b4c209b0..874e89e1f 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -1,3 +1,6 @@
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_news) %></h2>
+</div>
 <script type="text/javascript">
     function regexTitle()
     {
diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb
index aaf48f0ec..fed10b3f2 100644
--- a/app/views/projects/_tools_expand.html.erb
+++ b/app/views/projects/_tools_expand.html.erb
@@ -3,6 +3,9 @@
         <%= link_to l(:label_settings), settings_project_path(@project) %>
     <% end %>
 </li>
+<li>
+  <%= link_to l(:field_user_active_news), project_news_index_path(@project) %>
+</li>
 <li>
 	<%= link_to l(:project_module_wiki), project_wiki_path(@project) %>
 </li>
diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb
index e57696fc3..8b0a5a183 100644
--- a/app/views/projects/invite_members.html.erb
+++ b/app/views/projects/invite_members.html.erb
@@ -39,7 +39,7 @@
           <% end %>
         </p>
         <p>
-          <%= submit_tag l(:button_add), :id => 'member-add-submit', :style => 'display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;' %>
+          <%= submit_tag l(:label_invite_members), :id => 'member-add-submit', :style => 'display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;' %>
         </p>
        <% end %>
       <% end %>
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index c38aec404..c2a519167 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -1,2 +1 @@
-<%= stylesheet_link_tag  'project', :media => 'all' %>
 <%= render :partial => "invite_members_by_mail"%>
\ No newline at end of file
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 6a47f07f0..37c7a81a7 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -21,7 +21,8 @@
   <div class="scroll">
     <% unless @events_pages.empty? %>
     <% @events_pages.each do |e| -%>
-      <% act = e.forge_act %>
+      <% act = e.forge_act;
+         next if act.nil? %>
       <% if e.forge_act_type == "Issue" %>
       <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;margin-top: 10px;">
         <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb
index 2ae42e414..5505662f3 100644
--- a/config/initializers/kaminari_config.rb
+++ b/config/initializers/kaminari_config.rb
@@ -23,10 +23,10 @@
 Kaminari.configure do |config|
   # config.default_per_page = 25
   # config.max_per_page = nil
-  # config.window = 4
+   config.window = 2
   # config.outer_window = 3
-  # config.left = 0
-  # config.right = 0
+  # config.left = 2
+  # config.right = 2
   # config.page_method_name = :page
   # config.param_name = :page
 end
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 8437557ad..1faa9227d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1929,6 +1929,7 @@ zh:
   label_bids_task_list: 作业列表
   label_join_course: 加入
   label_invite_project: 邀请您加入项目
+  label_invite_members: 邀请用户
   label_exit_course: 退出
   label_exit_group: 退出当前分班
   label_new_join: 加入
diff --git a/config/routes.rb b/config/routes.rb
index cc64781f9..365c5a78e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -645,6 +645,7 @@ RedmineApp::Application.routes.draw do
   match 'admin/web_footer_made', as: :web_footer_made
   match 'admin/enterprise_page_made', as: :enterprise_page_made
   match 'admin/mobile_version', as: :mobile_version
+  match 'admin/create_version', as: :create_version
   match 'admin/search',  :via => [:get, :post]
   match 'admin/plugins',  :via => :get
   match 'admin/info',  :via => :get
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 70b49de3b..c80012f6a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -91,7 +91,7 @@ a:hover.more{ color:#64bdd9;}
 .box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
 .box_close:hover{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 /*邮件邀请*/
-.box_main{ width:345px; margin:0 auto;}
+.box_main{ width:345px; margin:0 auto;padding-left:40px;}
 .box_h3{ color:#15bccf; text-align:center; font-size:16px;}
 .box_p{ color:#404040; margin-bottom:5px;}
 .fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;}