Conflicts:
	snf-cyclades-app/synnefo/api/management/commands/flavor-list.py
	snf-cyclades-app/synnefo/api/management/commands/server-list.py
	snf-cyclades-app/synnefo/api/networks.py
	snf-cyclades-app/synnefo/logic/rapi.py