Fixed html for hypervisors and machines, added delete option for nypervisors closing JIN-124.
Merge branch 'test' into dev
Merge.