CC-5108 Waveform Editor UI
Merge branch 'master' of dev.sourcefabric.org:airtime