zog updates
fixed pyaudio conflict
Merge branch 'zog' into dev