Merge branch 'master' of https://code.grnet.gr/git/pithos

diff --cc snf-pithos-app/pithos/api/settings.py
index c842342,6a6011d..ad56a47
--- 1/snf-pithos-app/pithos/api/settings.py
--- 2/snf-pithos-app/pithos/api/settings.py
+++ b/snf-pithos-app/pithos/api/settings.py
@@@ -40,5 -40,3 +40,5 @@@ BACKEND_VERSIONING = getattr(settings, 
  # Update object checksums when using hashmaps.
  UPDATE_MD5 = getattr(settings, 'PITHOS_UPDATE_MD5', True)
  
 +# Service Token acquired by identity provider.
- SERVICE_TOKEN = getattr(settings, 'PITHOS_SERVICE_TOKEN', '')
++SERVICE_TOKEN = getattr(settings, 'PITHOS_SERVICE_TOKEN', '')