Перерисовка
Merge branch 'master'

Conflicts:
	dialog.cpp
	spectogramm.h
	spectrogrammdata.h