diff --git a/db/migrate/20150911064528_alter_user_activities.rb b/db/migrate/20150911064528_alter_user_activities.rb
index a65f933d8..07cccae89 100644
--- a/db/migrate/20150911064528_alter_user_activities.rb
+++ b/db/migrate/20150911064528_alter_user_activities.rb
@@ -1,21 +1,16 @@
 class AlterUserActivities < ActiveRecord::Migration
   def up
-    count = UserActivity.all.count / 30 + 3
-    transaction do
-      for i in 1 ... count do i
-        UserActivity.page(i).per(30).each do |activity|
-          if activity.act_type == 'Message'
-            if activity.act
-              unless activity.act.parent_id.nil?
-                parent_act = UserActivity.where("act_id = #{activity.act.parent.id} and act_type='Message'").first
-                parent_act.created_at = activity.act.parent.children.maximum("created_on")
-                parent_act.save
-                activity.destroy
-              end
-            else
-              activity.destroy
-            end
+    UserActivity.each do |activity|
+      if activity.act_type == 'Message'
+        if activity.act
+          unless activity.act.parent_id.nil?
+            parent_act = UserActivity.where("act_id = #{activity.act.parent.id} and act_type='Message'").first
+            parent_act.created_at = activity.act.parent.children.maximum("created_on")
+            parent_act.save
+            activity.destroy
           end
+        else
+          activity.destroy
         end
       end
     end
diff --git a/db/schema.rb b/db/schema.rb
index 850160f9c..b98ab20b4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150911031029) do
+ActiveRecord::Schema.define(:version => 20150911064528) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -236,6 +236,13 @@ ActiveRecord::Schema.define(:version => 20150911031029) do
     t.boolean  "tracker_in_review_dialog", :default => false
   end
 
+  create_table "code_review_user_settings", :force => true do |t|
+    t.integer  "user_id",           :default => 0, :null => false
+    t.integer  "mail_notification", :default => 0, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "code_reviews", :force => true do |t|
     t.integer  "project_id"
     t.integer  "change_id"
@@ -899,6 +906,7 @@ ActiveRecord::Schema.define(:version => 20150911031029) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
+    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"
@@ -1162,18 +1170,18 @@ ActiveRecord::Schema.define(:version => 20150911031029) do
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id"
     t.integer  "parent_id"
-    t.string   "subject",                               :null => false
-    t.text     "content",                               :null => false
+    t.string   "subject",                                                   :null => false
+    t.text     "content",            :limit => 16777215,                    :null => false
     t.integer  "author_id"
-    t.integer  "replies_count",      :default => 0
+    t.integer  "replies_count",                          :default => 0
     t.integer  "last_reply_id"
-    t.boolean  "lock",               :default => false
-    t.boolean  "sticky",             :default => false
-    t.boolean  "is_quote",           :default => false
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
-    t.integer  "viewed_count_crawl", :default => 0
-    t.integer  "viewed_count_local", :default => 0
+    t.boolean  "lock",                                   :default => false
+    t.boolean  "sticky",                                 :default => false
+    t.boolean  "is_quote",                               :default => false
+    t.datetime "created_at",                                                :null => false
+    t.datetime "updated_at",                                                :null => false
+    t.integer  "viewed_count_crawl",                     :default => 0
+    t.integer  "viewed_count_local",                     :default => 0
     t.string   "url"
     t.string   "username"
     t.string   "userhomeurl"
@@ -1198,6 +1206,19 @@ ActiveRecord::Schema.define(:version => 20150911031029) do
 
   add_index "repositories", ["project_id"], :name => "index_repositories_on_project_id"
 
+  create_table "rich_rich_files", :force => true do |t|
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.string   "rich_file_file_name"
+    t.string   "rich_file_content_type"
+    t.integer  "rich_file_file_size"
+    t.datetime "rich_file_updated_at"
+    t.string   "owner_type"
+    t.integer  "owner_id"
+    t.text     "uri_cache"
+    t.string   "simplified_type",        :default => "file"
+  end
+
   create_table "roles", :force => true do |t|
     t.string  "name",              :limit => 30, :default => "",        :null => false
     t.integer "position",                        :default => 1
@@ -1249,10 +1270,11 @@ ActiveRecord::Schema.define(:version => 20150911031029) do
     t.string   "url"
     t.string   "title"
     t.integer  "share_type"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
     t.integer  "project_id"
     t.integer  "user_id"
+    t.string   "description"
   end
 
   create_table "softapplications", :force => true do |t|
@@ -1422,8 +1444,8 @@ ActiveRecord::Schema.define(:version => 20150911031029) do
     t.integer  "zip_code"
     t.datetime "created_at",                         :null => false
     t.datetime "updated_at",                         :null => false
-    t.integer  "identity"
     t.string   "technical_title"
+    t.integer  "identity"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
@@ -1491,9 +1513,6 @@ ActiveRecord::Schema.define(:version => 20150911031029) do
     t.integer  "active"
     t.datetime "created_at",    :null => false
     t.datetime "updated_at",    :null => false
-    t.integer  "level"
-    t.integer  "file"
-    t.integer  "issue"
   end
 
   create_table "user_statuses", :force => true do |t|