修改了部分bug
Merge branch 'master' of git@github.com:celeskyking/s-tea.git