Merge branch 'master' into senslab2

diff --combined setup.py
index c3285eb,0c02f32..98d07a8
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -45,7 -45,6 +45,7 @@@ package_dirs = 
      'sfa/managers',
      'sfa/importer',
      'sfa/plc',
 +    'sfa/senslab',
      'sfa/rspecs',
      'sfa/rspecs/elements',
      'sfa/rspecs/elements/versions',
@@@ -53,7 -52,6 +53,6 @@@
      'sfatables',
      'sfatables/commands',
      'sfatables/processors',
-     'flashpolicy',
      ]