Merge branch 'master' of https://github.com/yuelaotou/wsun.git

Conflicts:
	src/main/webapp/WEB-INF/views/system/resource.jsp
	src/main/webapp/static/jquery-easyui-1.3.3/plugins/jquery.easyui.extend.js
Merge branch 'master' of https://github.com/yuelaotou/wsun.git