fixed merge with test and bluemonkey commits

diff --cc CMakeLists.txt
index 30c0ba3,c1762ae..fac2468
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -27,7 -27,7 +27,8 @@@ option(qt_bindings "AMB Qt DBus binding
  option(opencvlux_plugin "OpenCV Lux plugin" OFF)
  option(gpsd_plugin "gpsd location plugin" OFF)
  option(murphy_plugin "murphy policy framework plugin" OFF)
 +option(test_plugin "Test Plugin" ON)
+ option(bluemonkey_plugin "bluemonkey irc plugin" OFF)
  
  if(opencvlux_plugin)
     message(STATUS "OpenCV Lux plugin enabled")

diff --cc plugins/CMakeLists.txt
index 46548f0,a0f85ec..1c16960
--- 1/plugins/CMakeLists.txt
--- 2/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@@ -30,4 -30,4 +30,5 @@@ add_subdirectory(database
  add_subdirectory(opencvlux)
  add_subdirectory(gpsd)
  add_subdirectory(murphyplugin)
 +add_subdirectory(testplugin)
+ add_subdirectory(bluemonkey)