add --local option to avatar-mixer
Merge pull request #445 from ZappoMan/local_option

add --local option to avatar-mixer
Merge branch 'master' of https://github.com/worklist/hifi