Revert "Merge branch 'revert-e86f9476' of (one_click_nn_training) into 'master'"

This reverts merge request !33 (merged) This merges one_click_nn_training again into master