FIX: show conflict in icon text and balloon, and keep conflict dialog on Top, see http://sourceforge.net/p/googlesyncmod/support-requests/184/
Authored by: floriwan 2013-07-06
Parent: [r339]
Child: [r341]