In account and systray menu, put groupchat before single so menuitems with...

In account and systray menu, put groupchat before single so menuitems with submenus are grouped and it's easier to choose
where to click.
Add back disco to account menu.
Use the good label for account->group chat (doesn't break string freeze)