changed waveform resampling
Merge branch 'master' into experimental

Conflicts:
	SCTest/Classes/WaveFormView.m