OcciClient.py is opennebula based ad-hoc client for out purposes
OcciImage.py and OcciVMInstance manage the storage images and the compute instaces
deleting testing lines
director for Occi
adding occi director in the VM scheduler
Adding VMID by context
CHANGE: from DIRACVM 2 from VMDIRAC
CHANGE: import from VMDIRAC
Merge branch 'fix-imports' into integration
update imports from DIRACVM to VMDIRAC
Merge pull request #3 from graciani/master

update imports from DIRACVM to VMDIRAC
Merge pull request #2 from vmendez/fix-imports

CHANGE: from DIRACVM 2 from VMDIRAC
NEW: The ConfigTemplate.cfg
Merge pull request #4 from graciani/master

ConfigTemplate.cfg
Getting the VMId from VitualMachineMonitor
Merge branch 'integration' of git://github.com/DIRACGrid/VMDIRAC into integration
Merge branch 'integration' into occi

Conflicts:
	WorkloadManagementSystem/Agent/VirtualMachineScheduler.py
addin Occi SubmitPools by default in VirtualMachineScheduler configuraiton
Ading JobAgent to VMDIRAC config template
changing every getCSFlavorOption with getCSImageOption, our OCCI immages uses the options as a hold, no flavor is used in the way of EC2, only as simple option Flavor=Occi