Fix notes, closes JIN-129
Notes on hypervisor + add a little icon if it has one (on vm's too) JIN-21
Merge branch 'test' into dev
compile
Merge branch 'test' into dev