修复菜单图标显示问题
Merge branch '2.0' of https://github.com/openkoala/Koala into 2.0

Conflicts:
	koala-plugin/koala-plugin-create/src/main/resources/vm/base/war/src/main/webapp/pages/common/header.jsp.vm