修改command-material
Merge branch 'ito' of https://github.com/liqian008/geekway.git into ito

Conflicts:
	geekway-admin/src/main/java/com/bruce/geekway/admin/controller/geekway/GeekwayMaterialController.java
	geekway-admin/src/main/java/com/bruce/geekway/admin/controller/geekway/GeekwayUploadController.java
	geekway-admin/src/main/webapp/WEB-INF/jsp/geekway/commandEdit.jsp
	geekway-admin/src/main/webapp/WEB-INF/jsp/geekway/commandList.jsp
	geekway-service/src/main/java/com/bruce/geekway/dao/impl/WxCommandMaterialDaoImpl.java
	geekway-service/src/main/java/com/bruce/geekway/dao/impl/WxMaterialDaoImpl.java