no message
Merge branch 'develop' into feature/YIN-255-update-profile-password-payment-address

Conflicts:
	protected/config/main.php

Signed-off-by: Chaozhang Xue <475990465@qq.com>
Merge branch 'develop' of http://192.168.10.23:7990/scm/yin/basic into develop