Ui fixes + friends management with maps to avoid magic search research everytime

Merged Gaëlle Braud requested to merge release/6.0 into master

Merge request reports