调整navbar
Merge branch 'master' of https://github.com/cnberg/Qing

Conflicts:
	src/Control.js
	src/lib.js
	usecase/main.js