manual merge of tripzero/master

diff --cc plugins/common/dbusplugin.cpp
index 6bba358,ea71e91..909a097
--- 1/plugins/common/dbusplugin.cpp
--- 2/plugins/common/dbusplugin.cpp
+++ b/plugins/common/dbusplugin.cpp
@@@ -23,11 -26,9 +26,11 @@@
  #include "debugout.h"
  #include "listplusplus.h"
  
- DBusSink::DBusSink(string propertyName, AbstractRoutingEngine* engine, GDBusConnection* connection, map<string, string> config)
+ DBusSink::DBusSink(std::string propertyName, AbstractRoutingEngine* engine, GDBusConnection* connection, std::map<std::string, std::string> config)
 +std::map<std::string, std::string> DBusSink::dbusConfig;
 +
        :AbstractDBusInterface("org.automotive."+propertyName, propertyName, connection),
 -        AbstractSink(engine, config)
 +        AbstractSink(engine, dbusConfig)
  {
        AbstractDBusInterface::re = engine;