惯例配置修改
Merge remote-tracking branch 'origin/3.1' into 3.1

Conflicts:
	ThinkPHP/Conf/convention.php

Change-Id: I6f9ac3d898a7edce1c5b03a049473fe0ccf4ad7c