diff --git a/vendor/built_in_modules/ask_new/app/views/panel/ask/back_end/ask_questions/edit.html.erb b/vendor/built_in_modules/ask_new/app/views/panel/ask/back_end/ask_questions/edit.html.erb
index 7225f69a1..4d30b6b94 100644
--- a/vendor/built_in_modules/ask_new/app/views/panel/ask/back_end/ask_questions/edit.html.erb
+++ b/vendor/built_in_modules/ask_new/app/views/panel/ask/back_end/ask_questions/edit.html.erb
@@ -31,6 +31,7 @@
           ['已處理', '已處理'],
           ['轉介其他單位', '轉介其他單位']
         ] %></td>
+        <td id="XXX"></td>
       </tr>
       <tr>
         <td colspan="5">
diff --git a/log/.gitignore b/vendor/built_in_modules/ask_new/test/dummy/app/mailers/.gitkeep~HEAD
similarity index 100%
rename from log/.gitignore
rename to vendor/built_in_modules/ask_new/test/dummy/app/mailers/.gitkeep~HEAD
diff --git a/vendor/built_in_modules/ask_new/test/dummy/app/mailers/.gitkeep~HEAD_0 b/vendor/built_in_modules/ask_new/test/dummy/app/mailers/.gitkeep~HEAD_0
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/app/mailers/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529 b/vendor/built_in_modules/ask_new/test/dummy/app/mailers/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/app/mailers/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529_0 b/vendor/built_in_modules/ask_new/test/dummy/app/mailers/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529_0
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/app/models/.gitkeep~HEAD b/vendor/built_in_modules/ask_new/test/dummy/app/models/.gitkeep~HEAD
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/app/models/.gitkeep~HEAD_0 b/vendor/built_in_modules/ask_new/test/dummy/app/models/.gitkeep~HEAD_0
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/app/models/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529 b/vendor/built_in_modules/ask_new/test/dummy/app/models/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/app/models/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529_0 b/vendor/built_in_modules/ask_new/test/dummy/app/models/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529_0
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/lib/assets/.gitkeep~HEAD b/vendor/built_in_modules/ask_new/test/dummy/lib/assets/.gitkeep~HEAD
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/lib/assets/.gitkeep~HEAD_0 b/vendor/built_in_modules/ask_new/test/dummy/lib/assets/.gitkeep~HEAD_0
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/lib/assets/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529 b/vendor/built_in_modules/ask_new/test/dummy/lib/assets/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/lib/assets/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529_0 b/vendor/built_in_modules/ask_new/test/dummy/lib/assets/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529_0
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/log/.gitkeep~HEAD b/vendor/built_in_modules/ask_new/test/dummy/log/.gitkeep~HEAD
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/log/.gitkeep~HEAD_0 b/vendor/built_in_modules/ask_new/test/dummy/log/.gitkeep~HEAD_0
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/log/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529 b/vendor/built_in_modules/ask_new/test/dummy/log/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/log/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529_0 b/vendor/built_in_modules/ask_new/test/dummy/log/.gitkeep~b1b82cb9af6c2dadffc1a4a7608ea08660907529_0
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/public/favicon.ico~HEAD b/vendor/built_in_modules/ask_new/test/dummy/public/favicon.ico~HEAD
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/ask_new/test/dummy/public/favicon.ico~b1b82cb9af6c2dadffc1a4a7608ea08660907529 b/vendor/built_in_modules/ask_new/test/dummy/public/favicon.ico~b1b82cb9af6c2dadffc1a4a7608ea08660907529
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/index.html.erb b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/index.html.erb
index 30714cdc0..334d5973d 100644
--- a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/index.html.erb
+++ b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/index.html.erb
@@ -17,6 +17,6 @@
 <div class="form-actions form-fixed pagination-right">
 	<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:add), new_panel_faq_back_end_qa_path, :class => 'btn btn-primary pull-right' if (is_manager? rescue nil) %>
 	<div id="qa_pagination" class="paginationFixed">
-	<%= paginate @qas, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
+	<%= paginate @qas, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} rescue nil %>
 	</div>
 </div>