Revert "Merge branch 'master' of https://github.com/liuzhencai/QXH_20140524_XY"

This reverts commit b48a6b773f2e5968fbbc307918ee996999ae46fd, reversing
changes made to 1577cad104655efcb481800613b7aab48d29da86.
Merge branch 'master' of https://github.com/liuzhencai/QXH_20140524_XY

版本提交啊啊啊