Merge branch 'master' into audioAlign

Conflicts:
	mindmap.svg
	src/CMakeLists.txt
	src/audioscopes/CMakeLists.txt
	src/audioscopes/ffttools.cpp
	src/audioscopes/ffttools.h
	src/lib/audio/fftTools.cpp
	src/lib/audio/fftTools.h
	src/scopes/audioscopes/ffttools.cpp
	src/scopes/audioscopes/ffttools.h