优化
Merge branch 'master' of https://github.com/leochen36/qmik

Conflicts:
	src/plugins/Qmik.nav.js