mostly finished
Merged 'dev'.
finished tests
Merged 'dev'.
Finish e2e-conversation
Merge remote-tracking branch 'origin/dev' into dev