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

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

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

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

tsk/auto/tsk_auto.h

win32/blkcalc/blkcalc.vcxproj

win32/blkcat/blkcat.vcxproj

win32/blkls/blkls.vcxproj

win32/blkstat/blkstat.vcxproj

win32/callback-cpp-sample/callback-cpp-sample.vcxproj

win32/callback-sample/callback-sample.vcxproj

win32/fcat/fcat.vcxproj

win32/ffind/ffind.vcxproj

win32/fls/fls.vcxproj

win32/fsstat/fsstat.vcxproj

win32/hfind/hfind.vcxproj

win32/icat/icat.vcxproj

win32/ifind/ifind.vcxproj

win32/ils/ils.vcxproj

win32/img_cat/img_cat.vcxproj

win32/img_stat/img_stat.vcxproj