modified:   admin/control/forum_control.class.php
	modified:   admin/view/forum_merge.htm
	modified:   control/forum_control.class.php
	modified:   view/common.css
	modified:   view/js/editor/iframe.css
	modified:   view/thread_index.htm