sync
Merge branch 'master' of https://github.com/pscedu/sft
Merge branch 'master' of https://github.com/pscedu/sft
Merge branch 'master' of https://github.com/pscedu/sft
fix manual edition