补充一些代码
Merge branch 'master' of https://github.com/cnberg/Qing

Conflicts:
	src/Layout.js
	src/main.js
	usecase/main.js