modified:   upgrade/dx2_to_xn2.php
	modified:   view/common.css
Merge branch 'master' of github.com:xiuno/xiunobbs

Conflicts:
	upgrade/dx2_to_xn2.php
	deleted:    dx2_to_xn2.php