Merge branch 'design_team' into ldap

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
+//= require page_edit
+//= require tinymce-jquery
+//= require tinymce_orbit

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 %>