merged master onto senslab2, manually solved conflicts in setup.py

(under control) and rspec.py (now in sfa/rspecs), the latter being the
mainstream version as is

diff --cc setup.py
index 921139c,c28e38d..d6fd9e1
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -36,17 -36,18 +36,19 @@@ bins = 
  
  package_dirs = [
      'sfa', 
-     'sfa/client',
-     'sfa/methods',
-     'sfa/plc',
-     'sfa/senslab',
-     'sfa/server',
      'sfa/trust',
      'sfa/util', 
+     'sfa/client',
+     'sfa/server',
+     'sfa/methods',
+     'sfa/generic',
      'sfa/managers',
      'sfa/managers/vini',
+     'sfa/plc',
++    'sfa/senslab',
      'sfa/rspecs',
      'sfa/rspecs/elements',
+     'sfa/rspecs/elements/versions',
      'sfa/rspecs/versions',
      'sfatables',
      'sfatables/commands',

diff --cc sfa/trust/auth.py
Simple merge