filtering out VM folders that cannot contain VMs, added sorting to edit dialog elements
Merge remote-tracking branch 'origin/master'