EHN: plot_Xray_line with all different lines
Bug: import utils
Merge branch 'NEW_edsSpectrum' into edslab
Merge branch 'NEW_edsSpectrum' into edslab
Merge branch 'NEW_edsSpectrum' into edslab
Merge branch 'NEW_edsSpectrum' into edslab
Merge branch 'NEW_edsSpectrum' into edslab
Merge branch 'NEW_edsSpectrum' into edslab
Merge branch 'NEW_edsSpectrum' into edslab
Merge branch 'NEW_edsSpectrum' into edslab
EHN: Xray range
Problem: merging
Merge branch 'master' into edslab

Conflicts:
	hyperspy/gui/tools.py
	hyperspy/io_plugins/hdf5.py
	hyperspy/io_plugins/netcdf.py
	hyperspy/signals/eds.py
	hyperspy/signals/eds_sem.py
Merge branch '0.7.rc' of https://github.com/hyperspy/hyperspy into edslab
BUG: merging with master
EHN: tidy up misc.eds.utils
EHN: create calibrate_energy_resolution
Merge branch 'master' into edslab
Merge branch 'master' into edslab
Merge branch 'master' into edslab