added resume trainin
Merge branch 'master' of https://github.com/rexos/kokko
Merge branch 'master' of https://github.com/rexos/kokko
Merge branch 'master' of https://github.com/rexos/kokko
Merge branch 'master' of https://github.com/rexos/kokko
Merge branch 'master' of https://github.com/rexos/kokko
Merge branch 'master' of https://github.com/rexos/kokko
added setting edit feat.
Merge branch 'master' of https://github.com/rexos/kokko