Various updates

Merged Philipp Arras requested to merge pa into NIFTy_7

Merge request reports