代码更新
Merge branch 'master' of https://github.com/liuzhencai/QXH_20140524_XY