Merge branch 'master' into senslab2

diff --cc setup.py
Simple merge

diff --cc sfa/methods/ListResources.py
index 522c131,328ddb2..386b7f2
--- 1/sfa/methods/ListResources.py
--- 2/sfa/methods/ListResources.py
+++ b/sfa/methods/ListResources.py
@@@ -1,10 -1,12 +1,12 @@@
  import zlib
 -
 +import sys
  from sfa.util.xrn import urn_to_hrn
  from sfa.util.method import Method
- from sfa.util.parameter import Parameter, Mixed
- from sfa.trust.credential import Credential
  from sfa.util.sfatablesRuntime import run_sfatables
+ from sfa.util.faults import SfaInvalidArgument
+ from sfa.trust.credential import Credential
+ 
+ from sfa.storage.parameter import Parameter, Mixed
  
  class ListResources(Method):
      """