Added console for OS Machines.
Added vm icons.
Merge branch 'test' into dev