a
Merge branch 'dianxin' of https://github.com/rhzchina/westAll into dianxin