some errors has repaired,and the unfinished part come soon.
Merge branch 'master' of https://github.com/snowshana/test