Also, fix order of Pithos DB migrations.

Conflicts:
	Changelog
	docs/compute-api-guide.rst
	snf-astakos-app/astakos/im/tables.py
	snf-cyclades-app/synnefo/api/floating_ips.py
	snf-cyclades-app/synnefo/api/tests/floating_ips.py
	snf-cyclades-app/synnefo/api/tests/images.py
	snf-cyclades-app/synnefo/api/tests/servers.py
	snf-cyclades-app/synnefo/logic/subnets.py
	snf-cyclades-app/synnefo/plankton/backend.py
	snf-cyclades-app/synnefo/ui/static/snf/js/ui/web/ui_create_view.js
	snf-tools/synnefo_tools/burnin/cyclades_common.py
	version