Merge branch 'demo-mano-integration' of github.com:mpeuster/son-emu into demo-mano...