Merge branch 'design_team' into ldap

Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb

config/locales/en.yml

@@ -91,6 +91,7 @@ en:
       ab_fx: FX
       all_banners: AdBanner list
       banner_best_size: Banner Best Size
+      best_size: Best size
       new_banner: New banner
       new_image: New image
       showing: Showing
@@ -216,6 +217,10 @@ en:
     options: Options
     orig_upload_file: Original filename
     page: Page
+    page_context:
+      edit: Edit
+      ob_auth:
+        edit: Category authorization
     page_part_kinds:
       text: Text Area
       public_r_tag: System Widget

config/locales/zh_tw.yml

@@ -88,6 +88,7 @@ zh_tw:
       ab_fx: 轉場特效
       all_banners: 輪播清單
       banner_best_size: Banner 尺寸
+      best_size: 最佳尺寸
       cate_auth: 分類授權
       delete_banner: 刪除整組輪播
       new_banner: 新增輪播

config/mongoid.yml

@@ -8,7 +8,7 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: prototype_r4_ldap0229
+  database: prototype_r4_development
 
 test:
   <<: *defaults
@@ -22,4 +22,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: prototype_r4_ldap0229
+  database: prototype_r4_development