Merge remote-tracking branch 'upstream/develop' into 4682_addImage

bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java

@@ -1179,7 +1179,17 @@ public enum ARTIFACT_TYPE implements SleuthkitVisitableItem {
 		 * Categorization information for a data source.
 		 */
 		TSK_DATA_SOURCE_USAGE(48, "TSK_DATA_SOURCE_USAGE", //NON-NLS
-				bundle.getString("BlackboardArtifact.tskDataSourceUsage.text"));
+				bundle.getString("BlackboardArtifact.tskDataSourceUsage.text")),
+		/**
+		 * Indicates auto fill data from a Web form
+		 */
+		TSK_WEB_FORM_AUTOFILL(49, "TSK_WEB_FORM_AUTOFILL",  //NON-NLS
+				bundle.getString("BlackboardArtifact.tskWebFormAutofill.text")),
+		/**
+		 * Indicates an person's address filled in a web form
+		 */
+		TSK_WEB_FORM_ADDRESS (50, "TSK_WEB_FORM_ADDRESSES ",  //NON-NLS
+				bundle.getString("BlackboardArtifact.tskWebFormAddresses.text"));
 		
 		private final String label;
 		private final int typeId;

bindings/java/src/org/sleuthkit/datamodel/Bundle.properties

@@ -45,6 +45,8 @@ BlackboardArtifact.tskBluetoothAdapter.text=Bluetooth Adapter
 BlackboardArtifact.tskWIFINetworkAdapter.text=Wireless Network Adapters
 BlackboardArtifact.tskVerificationFailed.text=Verification Failure
 BlackboardArtifact.tskDataSourceUsage.text=Data Source Usage
+BlackboardArtifact.tskWebFormAutofill.text=Web Form Autofill
+BlackboardArtifact.tskWebFormAddresses.text=Web Form Addresses
 BlackboardArtifact.shortDescriptionDate.text=at {0}
 BlackboardAttribute.tskAccountType.text=Account Type
 BlackboardAttribute.tskUrl.text=URL