Removed momentum from Conjugate Gradient
Merge branch 'devel' into pako-develºº