modifie history order and training  order
Merge branch 'master' of github.com:foright/yami