fixed resume and trainings
Merge remote-tracking branch 'origin/master'