CIRCLE / cloud

Conflicts:
	circle/dashboard/management/commands/init.py
	circle/dashboard/templates/dashboard/storage/detail.html
	circle/dashboard/views/vm.py
	circle/storage/models.py
	requirements/base.txt