cleanup
Merge branch 'master', remote-tracking branch 'ciju/master'
send acknowledgement
app config update
log all conversations