修改资源选择器
Merge branch 'tlw' of https://github.com/liqian008/geekway.git into tlw

Conflicts:
	geekway-admin/src/main/java/com/bruce/geekway/admin/controller/geekway/GeekwayPickMaterialController.java
	geekway-admin/src/main/java/com/bruce/geekway/admin/controller/mp/GeekwayMpReplyController.java
	geekway-admin/src/main/webapp/WEB-INF/jsp/geekway/commandEdit.jsp
	geekway-admin/src/main/webapp/WEB-INF/jsp/geekway/historyMessageDialog.jsp
	geekway-admin/src/main/webapp/WEB-INF/jsp/pickMaterial/pickArticleMaterial.jsp