Merge branch 'scalable_energies2' into 'NIFTy_6'

Scalable energies2

See merge request !402
9 jobs for NIFTy_6 in 15 minutes and 22 seconds (queued for 3 seconds)