PPP
Merge branch 'wensong'

Conflicts:
	config.inc.php