Merge branch 'lukas_issue122_refac_epoch-def-location' into 'develop'

Resolve "Discussion: right location of epoch parameter"

See merge request toar/machinelearningtools!105