Signed-off-by: wucangzhou <wucangzhou@gmail.com>
Merge branch 'master' into cangZhou

Conflicts:
	protected/backend/runtime/application.log

Signed-off-by: wucangzhou <wucangzhou@gmail.com>