Merge branch 'design_team' into ldap

Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb

config/list.yml

@@ -9,6 +9,7 @@ markups:
   
 public_r_tags:
   - ad_banner
+  - sub_menu
   
 page_part_kinds:
   - text

config/routes.rb

@@ -77,6 +77,7 @@ Orbit::Application.routes.draw do
     resources :page_parts do
       member do
         get 'reload_widgets'
+        get 'reload_r_tag_options'
       end
     end
     resources :purchases do