new for test
delete unused
fixed some problems
Merge branch 'master' of https://github.com/applyhhj/test
fix