Merge branch 'refs/heads/testB'

Conflicts:
	common/phpmodule/news.php
text 修正
Merge branch 'refs/heads/test' into staging