weigx
Merge branch 'master' of https://github.com/dingyi216/d1

Conflicts:
	src/main/webapp/WEB-INF/jsp/layout/basic-theme.jsp