ver.0701
Merge branch 'master' of https://github.com/lapertem4/mingpianwang