Modified conjugate gradient to regularize only at the end
Merge branch 'pako-devel' into dropout