Merge pull request #1967 from APriestman/mergingDevelop

bindings/java/jni/auto_db_java.cpp

bindings/java/jni/auto_db_java.h

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

...va/src/org/sleuthkit/datamodel/CommunicationsManager.java

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

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

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

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

...rg/sleuthkit/datamodel/TimelineEventArtifactTypeImpl.java

...datamodel/TimelineEventArtifactTypeSingleDescription.java

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

win32/tsk_jni/tsk_jni.vcxproj