Merge branch 'master' into ldap

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

config/locales/zh_tw.yml

@@ -42,6 +42,14 @@ zh_tw:
   admin:
     action: 操作
     ad_banner: 廣告輪播
+    ad:
+      ab_fx: 轉場特效
+      all_banners: 輪播清單
+      new_banner: 新增輪播
+      new_image: 新增橫幅
+      title: 標題
+      transition_sec: 轉場單位時間
+      trans_unit_sec: 秒
     add: 新增
     add_item: 新增項目
     add_language: 新增語言