Merge branch 'master' into calib_gain_selection

* master:
  Added my emails to mailmap (cta-observatory#1098)
  Restore returning selected channels in gain selection (cta-observatory#1094)

# Conflicts:
#	ctapipe/calib/camera/gainselection.py
#	ctapipe/calib/camera/tests/test_gainselection.py

.mailmap

@@ -28,6 +28,8 @@ Lukas Nickel <[email protected]> LukasNickel <lukas.nickel@tu-dortmund
 
 Maximilian Nöthe <[email protected]> Maximilian Noethe <[email protected]>
 
+Michele Peresano <[email protected]> Michele Peresano <[email protected]>
+
 Raquel de los Reyes <[email protected]> rdelosreyes <[email protected]>
 
 Samuel Timothy Spencer <[email protected]> Samuel Timothy Spencer <[email protected]>