Addressing merge conflict from develop

NEWS.txt

bindings/java/build.xml

bindings/java/doxygen/Doxyfile

bindings/java/doxygen/artifact_catalog.dox

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

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

...java/src/org/sleuthkit/datamodel/Bundle.properties-MERGED

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

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

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

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

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

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

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

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

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

...gs/java/src/org/sleuthkit/datamodel/SpecialDirectory.java

...s/java/src/org/sleuthkit/datamodel/TimelineEventType.java

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

case-uco/java/nbproject/project.properties