diff --git a/app/assets/javascripts/site_editor.js b/app/assets/javascripts/site_editor.js
index 4451accba..2076f04d6 100644
--- a/app/assets/javascripts/site_editor.js
+++ b/app/assets/javascripts/site_editor.js
@@ -12,4 +12,6 @@
 //= require orbit-1.0
 //= require orbit-bar-search
 //= require side_bar_history
-//= require page_edit
\ No newline at end of file
+//= require page_edit
+//= require tinymce-jquery
+//= require tinymce_orbit
\ No newline at end of file
diff --git a/app/views/admin/page_parts/_text.html.erb b/app/views/admin/page_parts/_text.html.erb
index cc6264a51..c7386623a 100644
--- a/app/views/admin/page_parts/_text.html.erb
+++ b/app/views/admin/page_parts/_text.html.erb
@@ -2,7 +2,7 @@
   <% @site_valid_locales.each do |locale| %>
     <div>
 		  <%= I18nVariable.from_locale(locale) %>
-		  <%= f.text_area locale %>
+		  <%= f.text_area locale, :class => 'tinymce_textarea' %>
 	  </div>
   <% end %>
 <% end %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index f7afa9004..f6b788a8c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,6 +62,9 @@ Orbit::Application.routes.draw do
       end
     end
     resources :module_apps do
+      match 'manager_auth_proc' => "new_interface_module_apps#setting" ,:as => :manager_auth_proc,:via => :get
+      match 'manager_auth_proc' => "new_interface_module_apps#update_setting" ,:as => :manager_auth_proc,:via => :post
+      match 'manager_auth_proc' => "new_interface_module_apps#user_list" ,:as => :manager_auth_show,:via => :put
       resources :app_auths do
         member do
           match 'remove/:type/:target_id' ,:action=> 'remove',:via => "delete",:as =>:remove
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index 8ed6389a8..e1aa7739f 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -320,7 +320,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   
   def get_categorys(id = nil)
     @bulletin_categorys = []
-    @unit_list_for_anc = UnitListForAnc.all
+    #@unit_list_for_anc = UnitListForAnc.all
     if(is_manager? || is_admin?)
       @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
     elsif is_sub_manager?
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index 008090f42..43f293445 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -33,7 +33,7 @@ class Bulletin
   mount_uploader :image, ImageUploader
   
   belongs_to :bulletin_category
-  belongs_to :unit_list_for_anc
+#  belongs_to :unit_list_for_anc
   
   # embeds_many :bulletin_links, :cascade_callbacks => true
   # embeds_many :bulletin_files, :cascade_callbacks => true
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 884d69371..949645433 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -126,8 +126,8 @@
 	<div id="post-body">
 		<div id="post-body-content" class="clear">
 
-			<%= f.label :unit_list_for_anc%>
-			<%= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
+			<%#= f.label :unit_list_for_anc%>
+			<%#= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
 		
 			<%= f.label :category %>
 			<%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.i18n_variable[I18n.locale], t.id ]}, {}, :class => "input-medium" %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
index 8c373ddb8..eabacca96 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb
@@ -4,7 +4,7 @@
 	<div class="info1">
 		<span class="date"><%= @bulletin.postdate %></span>
 		&nbsp;|&nbsp;
-		<a href="" class="unit"><%= @bulletin.unit_list_for_anc.title[I18n.locale] rescue '' %></a>
+		<a href="" class="unit"><%= User.find(@bulletin.create_user_id).sub_roles.collect{|t| t.key}.join(" ") rescue '' %></a>
 	</div>
 </div>
 <div class="news_image">
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/home_list.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/home_list.html.erb
index e5f2abd20..5be530411 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/home_list.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/home_list.html.erb
@@ -1,5 +1,7 @@
-<h3 class="link_title"><%= t("announcement.related_links") %></h3>
+<div class="quicklinks">
+	<h3 class="link_title"><%= t("announcement.related_links") %></h3>
 
-<div id='web_links_links'>
-	<%= render 'web_links' %>
+	<div id='web_links_links'>
+		<%= render 'web_links' %>
+	</div>
 </div>