modified:   install/index.php
Merge branch 'master' of github.com:xiuno/xiunobbs

Conflicts:
	xiunophp
	modified:   model/online.class.php