Finish dutscher-friendrequests-list
trying to fix occasional error in conversation test
Merged 'dev'.