merging develepment branch.  don't kill me!
Moving stuff around, this might be extremely painful
Fixed the mixing problem with mics when the desktop is muted