Merge branch 'master' into contact_list

sflphone-gtk/src/actions.c

sflphone-gtk/src/actions.h

sflphone-gtk/src/config/configwindow.c

sflphone-gtk/src/contacts/calltree.c

sflphone-gtk/src/main.c

sflphone-gtk/src/menus.c

sflphone-gtk/src/menus.h

sflphone-gtk/src/sflnotify.c

src/managerimpl.cpp

src/sipvoiplink.cpp