modified:   conf/conf.php
	modified:   control/index_control.class.php
	modified:   view/js/common.js
	modified:   control/attach_control.class.php
	modified:   control/index_control.class.php
	modified:   view/attach_dialog_ajax.htm
Merge branch 'master' of github.com:xiuno/xiunobbs

Conflicts:
	xiunophp

	modified:   view/common.css
	modified:   view/forum_index.htm
	modified:   view/forum_list.htm
	modified:   view/index.htm
	modified:   view/thread_index.htm