full conversion
Merge branch 'master' of https://github.com/Radiodef/WaveformDemo

adding full conversion
Merge branch 'master' of https://github.com/Radiodef/WaveformDemo

Conflicts:
	waveformdemo/WaveformDemo.java
test push, no changes ;)