20141111小张修改新增材料
Merge branch 'master' of https://github.com/jerrytan/zcw