modified:   xn_cms/conf.php
	renamed:    xn_cms/header.htm -> xn_cms/header_bak.htm
	new file:   xn_cms/header_menu_end.htm
	new file:   xn_cms/header_menu_start.htm
	new file:   xn_cms/xn_cms_index.htm
	new file:   xn_shop/conf.php
	new file:   xn_shop/install.php
	modified:   ../view/common.css
	modified:   ../view/footer.htm
	modified:   ../view/js/common.js
Merge branch 'master' of github.com:xiuno/xiunobbs

Conflicts:
	view/test_drag.htm