暂存提交
响应式菜单按钮不显示问题解决，又是jquery的重复引用
Merge branch 'navbar调试'

Conflicts:
	WebRoot/page/mainimg.jsp
	WebRoot/page/navbar.jsp
	WebRoot/page/quiz.jsp
	WebRoot/page/register.jsp