Merge branch 'master' into senslab2

Conflicts:
	sfa/managers/registry_manager.py

diff --cc setup.py
Simple merge

diff --cc sfa/client/sfi.py
Simple merge

diff --cc sfa/plc/plslices.py
index 4a88e22,9413e81..2937d72
--- 1/sfa/plc/plslices.py
--- 2/sfa/plc/plslices.py
+++ b/sfa/plc/plslices.py
@@@ -1,7 -1,7 +1,8 @@@
  from types import StringTypes
  from collections import defaultdict
 +import sys
  
+ from sfa.util.sfatime import utcparse, datetime_to_epoch
  from sfa.util.sfalogging import logger
  from sfa.util.xrn import Xrn, get_leaf, get_authority, urn_to_hrn
  #from sfa.util.policy import Policy

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