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

解决冲突，提交