未提交的东西
Merge branch 'master' of https://github.com/dly1986/brother

Conflicts:
	protected/tests/createOrder.php