beginning of conversation support
added conversation framework
added conversation display
finished conversation framework
Merge remote-tracking branch 'upstream/master' into conversations
Merge branch 'paddatrapper-conversations'