Merge branch 'master' into ENH_plot_external_navigator
EHN: Add 'Spectrum' option
Merge branch 'ENH_plot_external_navigator' into NEW_edsSpectrum

Conflicts:
	hyperspy/drawing/mpl_hie.py
	hyperspy/drawing/mpl_hse.py
EHN: spectrum not Spectrum
BUG: solved a bug link to 'spectrum'
EHN: Dynamic navigator vs fixed navigator
Merge branch 'ENH_plot_external_navigator' into NEW_edsSpectrum