2
2
Merge branch 'refs/heads/testB' into staging

Conflicts:
	common/phpmodule/news.php