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/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/config/routes.rb b/config/routes.rb
index b105dabc3..f867d1351 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -642,6 +642,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/db/schema.rb b/db/schema.rb
index f4e6b09c7..bad1cf2ae 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,11 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-<<<<<<< HEAD
 ActiveRecord::Schema.define(:version => 20150305081132) do
-=======
-ActiveRecord::Schema.define(:version => 20150305011359) do
->>>>>>> 001b8bb1120fadea713d280e7d5bbabf7f5e57b8
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -819,19 +815,18 @@ ActiveRecord::Schema.define(:version => 20150305011359) do
     t.integer  "project_id"
   end
 
-<<<<<<< HEAD
-  create_table "phone_app_versions", :force => true do |t|
-    t.string   "version"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-=======
   create_table "organizations", :force => true do |t|
     t.string   "name"
     t.string   "logo_link"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
->>>>>>> 001b8bb1120fadea713d280e7d5bbabf7f5e57b8
+  end
+
+  create_table "phone_app_versions", :force => true do |t|
+    t.string   "version"
+    t.text     "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
   end
 
   create_table "poll_answers", :force => true do |t|