opencvlux config
Merge branch 'master' of https://github.com/otcshare/automotive-message-broker
fix for opencv plugin
Merge branch 'master' of https://github.com/otcshare/automotive-message-broker
Switch from json-glib to json-c in websocketsink, pluginloader, and mappropertytype
database playback functionality working
Merge branch 'master' of https://github.com/otcshare/automotive-message-broker
Changes for json-c instead of json-glib
Fix for crashing, and proper handling of json-c arrays
manual merge
fixed merge