Merge branch 'master' into senslab2

diff --combined setup.py
index cb3e98e,575dfd6..83d19bc
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -31,15 -31,6 +31,15 @@@ packages = 
      'sfa/generic',
      'sfa/managers',
      'sfa/importer',
 +
 +
 +
 +    'sfa/senslab',
 +
 +
 +
 +
 +
      'sfa/rspecs',
      'sfa/rspecs/elements',
      'sfa/rspecs/elements/versions',
@@@ -47,6 -38,7 +47,7 @@@
      'sfa/client',
      'sfa/planetlab',
      'sfa/nitos',
+     'sfa/dummy',
      'sfa/openstack',
      'sfa/federica',
      'sfatables',