Merge branch 'master' of https://code.grnet.gr/git/astakos into cloudbar

diff --cc snf-astakos-app/astakos/im/settings.py
index 1093a96,2f0e6df..393156b
--- 1/snf-astakos-app/astakos/im/settings.py
--- 2/snf-astakos-app/astakos/im/settings.py
+++ b/snf-astakos-app/astakos/im/settings.py
@@@ -47,9 -45,3 +45,9 @@@ BASEURL = getattr(settings, 'ASTAKOS_BA
  
  # Set service name
  SITENAME = getattr(settings, 'ASTAKOS_SITENAME', 'GRNET Cloud')
 +
 +# Set cloud services appear in the horizontal bar
 +CLOUD_SERVICES = getattr(settings, 'ASTAKOS_CLOUD_SERVICES', (
 +        { 'url':'/', 'name':'grnet cloud', 'id':'cloud', 'icon':'home-icon.png' },
 +        { 'url':'/okeanos.html', 'name':'~okeanos', 'id':'okeanos' },
-         { 'url':'/ui/', 'name':'pithos+', 'id':'pithos' }))
++        { 'url':'/ui/', 'name':'pithos+', 'id':'pithos' }))