编译提交，没做修改
Merge branch 'master' of https://github.com/liuzhencai/QXH_20140524_XY

编译解决bug
Merge branch 'master' of https://github.com/liuzhencai/QXH_20140524_XY