Merge branch 'master' of github.com:Rulingcom/NCCU

Conflicts:
	config/locales/zh_tw.yml

app/assets/javascripts/tinymce_orbit.js.erb

@@ -14,11 +14,11 @@ function load_tinymce() {
     theme_advanced_toolbar_align : "left",
     theme_advanced_statusbar_location : "bottom",
     theme_advanced_resizing : true,
-
+  relative_urls : false,
     // Skin options
     skin : "o2k7",
     skin_variant : "silver",
-
+    font_size_style_values : "xx-small,x-small,small,medium,large,x-large,xx-large",
     // Drop lists for link/image/media/template dialogs
     template_external_list_url : "js/template_list.js",
     // external_link_list_url : "js/link_list.js",