AIP restore squashed commit

Conflicts:
	storage_service/locations/api/resources.py
	storage_service/locations/models.py
	storage_service/storage_service/urls.py