Merge branch 'master' of https://github.com/hyperspy/hyperspy

Conflicts:
	hyperspy/signal.py
Merge branch 'master' of https://github.com/hyperspy/hyperspy

Conflicts:
	hyperspy/signal.py