Conflicts:
	Changelog
	docs/admin-guide.rst
	snf-cyclades-app/synnefo/api/management/commands/network-remove.py
	snf-cyclades-app/synnefo/api/servers.py
	snf-cyclades-app/synnefo/api/tests/servers.py
	snf-cyclades-app/synnefo/logic/backend.py
	snf-cyclades-app/synnefo/logic/tests/callbacks.py
	snf-cyclades-app/synnefo/quotas/__init__.py
	snf-django-lib/snf_django/lib/api/__init__.py
	snf-pithos-app/pithos/api/manage_accounts/__init__.py
	snf-pithos-backend/pithos/backends/modular.py
	version