导航栏的bug
Merge branch 'devel' of github.com:mixteam/mixsln into devel

Conflicts:
	dist/mixsln.min.js