diff --git a/Gemfile.lock b/Gemfile.lock
index 62118728..787692ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,8 +45,12 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
+<<<<<<< HEAD
     attr_required (0.0.5)
     bcrypt-ruby (3.0.0)
+=======
+    bcrypt-ruby (3.0.1)
+>>>>>>> f530fcc... change page number of archive
     binding_of_caller (0.7.1)
       debug_inspector (>= 0.0.1)
     bourne (1.1.2)
@@ -82,7 +86,11 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     chinese_pinyin (0.4.1)
     chronic (0.9.0)
+<<<<<<< HEAD
     coderay (1.0.9)
+=======
+    coderay (1.0.8)
+>>>>>>> f530fcc... change page number of archive
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -91,9 +99,14 @@ GEM
       execjs
     coffee-script-source (1.4.0)
     columnize (0.3.6)
+    curb (0.8.3)
     database_cleaner (0.9.1)
     debug_inspector (0.0.2)
+<<<<<<< HEAD
     debugger (1.2.4)
+=======
+    debugger (1.2.3)
+>>>>>>> f530fcc... change page number of archive
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
       debugger-ruby_core_source (~> 1.1.7)
@@ -122,6 +135,7 @@ GEM
       i18n (~> 0.5)
     fastercsv (1.5.5)
     fattr (2.2.1)
+<<<<<<< HEAD
     fb_graph (2.6.4)
       httpclient (>= 2.2.0.2)
       multi_json (>= 1.3)
@@ -129,6 +143,18 @@ GEM
       tzinfo
     ffi (1.4.0)
     haml (3.1.8)
+=======
+    feedzirra (0.0.24)
+      activesupport (>= 2.3.8)
+      builder (>= 2.1.2)
+      curb (>= 0.2.3)
+      loofah (>= 0.3.1)
+      nokogiri (> 0.0.0)
+      sax-machine (>= 0.0.12)
+    ffi (1.2.0)
+    haml (3.1.7)
+    hashie (1.2.0)
+>>>>>>> f530fcc... change page number of archive
     highline (1.6.15)
     hike (1.2.1)
     httpclient (2.3.2)
@@ -140,15 +166,30 @@ GEM
     jquery-ui-rails (4.0.1)
       jquery-rails
       railties (>= 3.1.0)
+<<<<<<< HEAD
     json (1.7.7)
+=======
+    json (1.7.6)
+    libv8 (3.11.8.13)
+    libwebsocket (0.1.7.1)
+      addressable
+      websocket
+    loofah (1.2.1)
+      nokogiri (>= 1.4.4)
+>>>>>>> f530fcc... change page number of archive
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     method_source (0.8.1)
+<<<<<<< HEAD
     mime-types (1.21)
     mini_magick (3.5.0)
+=======
+    mime-types (1.19)
+    mini_magick (3.4)
+>>>>>>> f530fcc... change page number of archive
       subexec (~> 0.2.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
@@ -191,7 +232,11 @@ GEM
     pry-stack_explorer (0.4.9)
       binding_of_caller (>= 0.7)
       pry (~> 0.9.11)
+<<<<<<< HEAD
     rack (1.4.5)
+=======
+    rack (1.4.4)
+>>>>>>> f530fcc... change page number of archive
     rack-cache (1.2)
       rack (>= 0.4)
     rack-oauth2 (1.0.0)
@@ -224,7 +269,12 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
+<<<<<<< HEAD
     rdoc (3.12.1)
+=======
+    rb-readline (0.4.2)
+    rdoc (3.12)
+>>>>>>> f530fcc... change page number of archive
       json (~> 1.4)
     redis (3.0.2)
     redis-namespace (1.2.1)
@@ -233,6 +283,7 @@ GEM
       chinese_pinyin (>= 0.3.0)
       redis (>= 2.1.1)
       redis-namespace (>= 1.0.2)
+    ref (1.0.2)
     resque (1.23.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.0)
@@ -275,7 +326,13 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
+<<<<<<< HEAD
     selenium-webdriver (2.30.0)
+=======
+    sax-machine (0.1.0)
+      nokogiri (> 0.0.0)
+    selenium-webdriver (2.27.2)
+>>>>>>> f530fcc... change page number of archive
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip
@@ -313,6 +370,9 @@ GEM
       sunspot (= 1.3.3)
     sunspot_solr (1.3.3)
     terminal-table (1.4.5)
+    therubyracer (0.11.3)
+      libv8 (~> 3.11.8.12)
+      ref
     thor (0.17.0)
     tilt (1.3.3)
     tinymce-rails (3.5.8)
@@ -352,11 +412,16 @@ DEPENDENCIES
   execjs
   factory_girl_rails
   faker
+<<<<<<< HEAD
   fb_graph
+=======
+  feedzirra
+>>>>>>> f530fcc... change page number of archive
   impressionist!
   jquery-rails (= 2.1.4)
   jquery-ui-rails
   kaminari!
+  libv8 (~> 3.11.8)
   mime-types
   mini_magick
   mongo_session_store-rails3 (= 3.0.6)
@@ -373,6 +438,7 @@ DEPENDENCIES
   radius
   rails (~> 3.2.9)
   rake
+  rb-readline
   redis (>= 2.1.1)
   redis-namespace
   redis-search
@@ -393,6 +459,7 @@ DEPENDENCIES
   sunspot-rails-tester
   sunspot_mongo
   sunspot_solr
+  therubyracer
   tinymce-rails
   uglifier
   watchr
diff --git a/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb b/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
index 05aacbc6..8c5410d8 100644
--- a/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
+++ b/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
@@ -11,7 +11,7 @@ class Panel::Archive::FrontEnd::ArchiveFilesController < OrbitWidgetController
     if !@item.frontend_data_count.blank?
       @page_num = @item.frontend_data_count
     else
-      @page_num = 1
+      @page_num = 10
     end
 
     date_now = Time.now