forgot to commit these
Merge branch 'devel' of https://github.com/Kaffse/multi-device-audio-project into devel