Merge branch 'nr/bugfix_crater' into 'master'

Updates induced by Crater (old PFS-version)

This merge request fixes Energy-Analyzers and adds new movement models used to evaluate Crater by @nricherz

See merge request !6