url
Merge branch 'master' of https://github.com/wuhailin/composer

Conflicts:
	common/config/main.php