soundpatchdemo upgrade
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/soundpatchdemo/DemoState.as
	src/soundpatchdemo/Main.as