chain
branding fix in astakos

Conflicts:
	snf-astakos-app/synnefo/astakos/im/views/im.py
astakos setup

Conflicts:
	snf-astakos-app/setup.py
services infrastructure

Conflicts:
	snf-django-lib/synnefo/django/lib/api/utils.py