yidong charge done
Merge branch 'yidong' of https://github.com/rhzchina/westAll into yidong