Resolved conflicts from merge of hashdb_sqlite branch

API-CHANGES.txt

bindings/java/jni/dataModel_SleuthkitJNI.cpp

bindings/java/jni/dataModel_SleuthkitJNI.h

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

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

tools/hashtools/hfind.cpp

tsk/hashdb/Makefile.am

tsk/hashdb/binsrch_index.c

tsk/hashdb/encase.c

tsk/hashdb/hashkeeper.c

tsk/hashdb/hdb_index.cpp

tsk/hashdb/hdb_open.cpp

tsk/hashdb/idxonly.c

tsk/hashdb/md5sum.c

tsk/hashdb/nsrl.c

tsk/hashdb/sqlite_index.cpp

tsk/hashdb/tm_lookup.cpp

tsk/hashdb/tsk_hashdb.h

tsk/hashdb/tsk_hashdb_i.h

win32/libtsk/libtsk.vcxproj