added local mode
Merge branch 'master' of https://github.com/worklist/hifi into localmode
Removed accidentally merged code
Merge pull request #538 from ZappoMan/localmode

added local mode to audio-mixer