Merge branch 'develop' into hjq_new_course

Conflicts:
	app/models/forge_activity.rb
	db/schema.rb

app/models/course.rb

@@ -1,6 +1,7 @@
 require 'elasticsearch/model'
 class Course < ActiveRecord::Base
   include Redmine::SafeAttributes
+  include ApplicationHelper
 
   STATUS_ACTIVE     = 1
   STATUS_CLOSED     = 5

app/models/issue.rb

@@ -19,6 +19,7 @@ class Issue < ActiveRecord::Base
   include Redmine::SafeAttributes
   include Redmine::Utils::DateCalculation
   include UserScoreHelper
+  include ApplicationHelper
   belongs_to :project,:touch=> true
   belongs_to :tracker
   belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'

app/models/message.rb

@@ -36,7 +36,6 @@ class Message < ActiveRecord::Base
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
-  has_many :user_acts, :class_name => 'UserActivity',:as =>:user_act ,:dependent => :destroy
 
   # end
   # 课程/项目 消息

app/models/org_document_comment.rb

@@ -1,6 +1,7 @@
 class OrgDocumentComment < ActiveRecord::Base
   attr_accessible :content, :creator_id, :organization_id, :parent_id, :reply_id, :title,:sticky,:locked
   include Redmine::SafeAttributes
+  include ApplicationHelper
   belongs_to :organization
   belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id'
   has_many :editor_of_documents, :dependent => :destroy

app/models/poll.rb

@@ -1,7 +1,8 @@
 class Poll < ActiveRecord::Base
   #attr_accessible :closed_at, :polls_group_id, :polls_name, :polls_status, :polls_type, :published_at, :user_id
   include Redmine::SafeAttributes
-  
+  include ApplicationHelper
+
   belongs_to :user
   has_many :poll_questions, :dependent => :destroy,:order => "#{PollQuestion.table_name}.question_number"
   has_many :poll_users, :dependent => :destroy