Merge branch 'more-accounts-fixes'

diff --cc libempathy-gtk/empathy-account-widget.c
Simple merge

diff --cc src/cc-empathy-accounts-page.c
Simple merge

diff --cc src/empathy-accounts-dialog.c
Simple merge