resolved merge conflicts with master

NEWS.txt

README_win32.txt

config/ltmain.sh

configure.ac

framework/modules/c_LibExifModule/LibExifModule.cpp

framework/msvcpp/framework/framework.vcxproj

framework/tsk/framework/services/Log.cpp

framework/tsk/framework/services/Log.h

framework/tsk/framework/services/TskSystemProperties.cpp

m4/ltoptions.m4

m4/ltsugar.m4

m4/ltversion.m4

m4/lt~obsolete.m4

packages/sleuthkit.spec

release/release-unix.pl

tsk/Makefile.am

tsk/auto/db_sqlite.cpp

tsk/base/tsk_base.h

tsk/base/tsk_error_win32.cpp

tsk/fs/ext2fs.c