Merge remote branch 'origin/typo' into tvierling
Merge remote branch 'origin/list_sort_fix' into tvierling
Merge remote branch 'origin/double_click_chat' into tvierling