本地修改,忘记提交
Merge branch 'master' of https://github.com/dly1986/brother

Conflicts:
	protected/tests/createOrder.php
	protected/tests/functional/ProductManage.php