Merge branch 'docstrings_energy_minimization' of...
Merge branch 'docstrings_energy_minimization' of https://gitlab.mpcdf.mpg.de/ift/NIFTy into docstrings_energy_minimization
Merge branch 'docstrings_energy_minimization' of https://gitlab.mpcdf.mpg.de/ift/NIFTy into docstrings_energy_minimization