modified:   admin/control/group_control.class.php
	modified:   admin/view/group_detail.htm
	modified:   admin/view/group_list.htm
	modified:   admin/view/plugin_index.htm
	modified:   admin/view/plugin_list.htm
	modified:   install/install_mongodb.php
	modified:   install/install_mysql.sql
	modified:   model/thread_type.class.php
	modified:   model/cron.class.php
	modified:   model/thread_type.class.php
	modified:   conf/conf.php
	modified:   view/thread_index.htm
	modified:   control/post_control.class.php
	modified:   view/common.css
	modified:   view/post_post_ajax.htm
	modified:   view/post_post_ajax.htm
	modified:   .gitignore
	new file:   index.html
Merge branch 'master' of github.com:xiuno/xiunobbs

Conflicts:
	xiunophp

	modified:   README.txt
	modified:   admin/control/forum_control.class.php
	modified:   control/mod_control.class.php
	modified:   install/install_mysql.sql
	modified:   model/modlog.class.php
	modified:   model/thread.class.php
	modified:   model/thread_type_data.class.php
	modified:   upgrade/dx2_to_xn2.php
	modified:   upgrade/rc3_to_release.php
	modified:   view/forum_index.htm