Merge branch 'master' into senslab2

diff --combined setup.py
index 97e0758,5512d99..358b15e
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -13,9 -13,6 +13,6 @@@ scripts = glob("sfa/clientbin/*.py") + 
      [ 
      'config/sfa-config-tty',
      'config/gen-sfa-cm-config.py',
-     'sfa/importer/sfa-import.py', 
-     'sfa/importer/sfa-nuke.py', 
-     'sfa/server/sfa-ca.py', 
      'sfa/server/sfa-start.py', 
      'sfa/server/sfa_component_setup.py', 
      'sfatables/sfatables',
@@@ -36,7 -33,6 +33,7 @@@ packages = 
      'sfa/managers',
      'sfa/importer',
      'sfa/plc',
 +    'sfa/senslab',
      'sfa/rspecs',
      'sfa/rspecs/elements',
      'sfa/rspecs/elements/versions',