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

bindings/java/doxygen/artifact_catalog.dox

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

...java/src/org/sleuthkit/datamodel/CaseDatabaseFactory.java

.../java/src/org/sleuthkit/datamodel/HostAddressManager.java

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

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

...ings/java/test/org/sleuthkit/datamodel/OsAccountTest.java