Merge branch 'master' of https://github.com/kdoba/Undoculife
add conversation dialog