Merge pull request #1539 from kellykelly3/1269-merg-timeline

bindings/java/build-unix.xml

bindings/java/build-windows.xml

bindings/java/ivy.xml

bindings/java/nbproject/project.xml

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

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

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

...java/src/org/sleuthkit/datamodel/BlackboardAttribute.java

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

...ngs/java/src/org/sleuthkit/datamodel/Bundle_ja.properties

...ava/src/org/sleuthkit/datamodel/CaseDbConnectionInfo.java

...ngs/java/src/org/sleuthkit/datamodel/CollectionUtils.java

...ings/java/src/org/sleuthkit/datamodel/DescriptionLoD.java

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

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

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

...a/src/org/sleuthkit/datamodel/ReadContentInputStream.java

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

...ava/src/org/sleuthkit/datamodel/SleuthkitItemVisitor.java

...a/src/org/sleuthkit/datamodel/SleuthkitVisitableItem.java