Merge branch 'master' into contact_list

Makefile.am

sflphone-gtk/src/accountlist.c

sflphone-gtk/src/accountlist.h

sflphone-gtk/src/call.c

sflphone-gtk/src/call.h

sflphone-gtk/src/config/configwindow.c

sflphone-gtk/src/dbus/configurationmanager-glue.h

sflphone-gtk/src/dbus/dbus.c

sflphone-gtk/src/dbus/dbus.h

src/dbus/callmanager.cpp

src/dbus/configurationmanager-glue.h

src/dbus/configurationmanager-introspec.xml

src/dbus/configurationmanager.cpp

src/dbus/configurationmanager.h

src/managerimpl.cpp

src/managerimpl.h

src/sipaccount.cpp

src/sipvoiplink.cpp

src/sipvoiplink.h

src/user_cfg.h