Merged in develop and fixed conflicts

...org/sleuthkit/autopsy/corecomponents/DataResultPanel.java

...uthkit/autopsy/corecomponents/DataResultTopComponent.java

...euthkit/autopsy/corecomponents/DataResultViewerTable.java

.../org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED

...euthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java

Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java

...org/sleuthkit/autopsy/datamodel/FileTypesByExtension.java

.../org/sleuthkit/autopsy/datamodel/FileTypesByMimeType.java

Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java

.../org/sleuthkit/autopsy/datamodel/RootContentChildren.java

Core/src/org/sleuthkit/autopsy/datamodel/ViewsNode.java

...rc/org/sleuthkit/autopsy/datamodel/accounts/Accounts.java

...it/autopsy/directorytree/DirectoryTreeFilterChildren.java

...hkit/autopsy/directorytree/DirectoryTreeTopComponent.java

...sleuthkit/autopsy/mainui/datamodel/AnalysisResultDAO.java

...euthkit/autopsy/mainui/datamodel/Bundle.properties-MERGED

...it/autopsy/mainui/datamodel/FileTypeSizeSearchParams.java

...leuthkit/autopsy/mainui/datamodel/KeywordMatchParams.java

...kit/autopsy/mainui/datamodel/KeywordSearchTermParams.java

Core/src/org/sleuthkit/autopsy/mainui/datamodel/MainDAO.java