WIP: Oneclick nn training

Nils Freyerrequested to merge
oneclick_nn_training into master

I merged the current master into my local branch again.

Merge request reports