Merge branch 'develop' of github.com:sleuthkit/autopsy into develop

Core/manifest.mf

Core/nbproject/project.properties

...stech/df/cybertriage/autopsy/ctapi/CTCloudHttpClient.java

...ch/df/cybertriage/autopsy/ctapi/json/LicenseResponse.java

.../cybertriage/autopsy/ctapi/util/LicenseDecryptorUtil.java

...tech/df/cybertriage/autopsy/ctoptions/CTOptionsPanel.java

...f/cybertriage/autopsy/ctoptions/ctcloud/Bundle.properties

...triage/autopsy/ctoptions/ctcloud/Bundle.properties-MERGED

...ybertriage/autopsy/ctoptions/ctcloud/CTLicenseDialog.form

...ybertriage/autopsy/ctoptions/ctcloud/CTLicenseDialog.java

...topsy/ctoptions/ctcloud/CTMalwareScannerOptionsPanel.java

.../df/cybertriage/autopsy/incidentoptions/Bundle.properties

...ertriage/autopsy/incidentoptions/Bundle.properties-MERGED

...autopsy/incidentoptions/CTIncidentImportOptionsPanel.form

...autopsy/incidentoptions/CTIncidentImportOptionsPanel.java

...ch/df/cybertriage/autopsy/incidentoptions/CTSettings.java

...triage/autopsy/incidentoptions/CTSettingsPersistence.java

CoreLibs/manifest.mf

Experimental/nbproject/project.xml

ImageGallery/nbproject/project.xml