Merge branch 'stable/havana' of https://github.com/enolfc/occi-os

Conflicts:
	occi_os_api/nova_glue/vm.py
fixed open merge; adapted to newest api changes in OS; fixed detachment of storage