settings infrastructure
astakos services and urls

Conflicts:
	snf-astakos-app/synnefo/astakos/im/astakos_resources.py
	snf-astakos-app/synnefo/astakos/im/management/commands/service-export-astakos.py
	snf-astakos-app/synnefo/astakos/im/settings.py
	snf-astakos-app/synnefo/astakos/oa2/services.py
	snf-astakos-app/synnefo/astakos/urls.py
astakos settings

Conflicts:
	snf-astakos-app/astakos/settings/__init__.py
	snf-astakos-app/astakos/synnefo_settings.py
	snf-astakos-app/synnefo/astakos/synnefo_settings.py
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
astakos services/urls tests

Conflicts:
	snf-astakos-app/synnefo/astakos/im/tests/api.py
cyclades services and urls

Conflicts:
	snf-cyclades-app/synnefo/cyclades/api/tests/flavors.py
	snf-cyclades-app/synnefo/cyclades/api/tests/images.py
	snf-cyclades-app/synnefo/cyclades/api/tests/networks.py
	snf-cyclades-app/synnefo/cyclades/api/tests/servers.py
	snf-cyclades-app/synnefo/cyclades/api/tests/versions.py
	snf-cyclades-app/synnefo/cyclades/api/util.py
	snf-cyclades-app/synnefo/cyclades/cyclades_settings.py
	snf-cyclades-app/synnefo/cyclades/quotas/resources.py
	snf-cyclades-app/synnefo/cyclades/ui/settings.py
	snf-cyclades-app/synnefo/cyclades/urls.py
service infrastructure more
cyclades setup

Conflicts:
	snf-cyclades-app/setup.py
cyclades settings

Conflicts:
	snf-cyclades-app/synnefo/app_settings/default/__init__.py
	snf-cyclades-app/synnefo/cyclades/app_settings/default/backend.py
	snf-cyclades-app/synnefo/cyclades/app_settings/default/cloudbar.py
	snf-cyclades-app/synnefo/cyclades/app_settings/default/reconciliation.py
	snf-cyclades-app/synnefo/cyclades/app_settings/default/tests.py
	snf-cyclades-app/synnefo/cyclades/plankton/tests.py
	snf-cyclades-app/synnefo/cyclades/vmapi/settings.py
	snf-cyclades-app/synnefo/cyclades/vmapi/tests.py
gtools settings
gtools setup

Conflicts:
	snf-cyclades-gtools/setup.py
stats settings

Conflicts:
	snf-stats-app/synnefo/stats/settings.py
stats setup

Conflicts:
	snf-stats-app/setup.py
pithos services and resources

Conflicts:
	snf-pithos-app/synnefo/pithos/api/management/commands/service-export-pithos.py
	snf-pithos-app/synnefo/pithos/api/resources.py
	snf-pithos-app/synnefo/pithos/api/settings.py
pithos settings

Conflicts:
	snf-pithos-app/synnefo/pithos/api/settings.py
pithos setup

Conflicts:
	snf-pithos-app/setup.py
webproject settings