Fixed some names in Conference Presentation form. Added (showing X from X) in training
Merge branch 'master' of github.com:archie18/MeloLabEva