Signed-off-by: Jingye Wang <4893278@qq.com>
Merge branch 'master' of https://github.com/yincart/basic

Conflicts:
	protected/backend/runtime/application.log

Signed-off-by: Jingye Wang <4893278@qq.com>