各种更新
Merge branch 'master' of https://github.com/ShawnVIP/www

Conflicts:
	res/getversion.php