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
remove cloudbar settings
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
webproject setup
new settings management commands
common settings
WIP module entry point
common setup
branding settings

Conflicts:
	snf-branding/synnefo/branding/settings.py
	snf-branding/synnefo/branding/utils.py
branding setup

Conflicts:
	snf-branding/setup.py
ci changes
Changelog

Conflicts:
	Changelog