Merge "Make FolderIcon.getFolder() public and add Folder.getContent()." into ub-now-mister-ugly