WaveForm Now renders on the Audio Canvas
Merge branch 'master' of github.com:IMDC/LiveDescribe-Desktop

Conflicts:
	LiveDescribe/LiveDescribe/View/MainWindow.xaml