Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509

Conflicts:
	config/locales/zh_tw.yml

config/locales/en.yml

@@ -204,6 +204,10 @@ en:
     options: Options
     orig_upload_file: Original filename
     page: Page
+    page_part_kinds:
+      text: Text Area
+      public_r_tag: System Widget
+      module_widget: Plug-in Module Widget
     position: Position
     published?: Published?
     purchase: Purchase

config/locales/zh_tw.yml

@@ -203,6 +203,10 @@ zh_tw:
       edit: 編輯
       ob_auth:
         edit: 分類授權
+    page_part_kinds:
+      text: 文字區塊
+      public_r_tag: 系統模塊
+      module_widget: 外掛模塊
     position: 位置
     published?: 發布?
     purchase: 購買

config/routes.rb

@@ -54,6 +54,7 @@ Orbit::Application.routes.draw do
       get 'add_attribute_field'
     end
     resources :items
+    match 'update_position' => 'items#update_position'
     resources :links do
       member do
         get 'delete'