Resolved merge conflict by choosing remotes Makefile.am
Removed old TskModules folder
Changed AM_CONFIG_HEADERS to AC_CONFIG_HEADERS
Updated to latest 4.1-linux-build versions of modules.
Fixed include path.
Made condition argument to TskImgDB::getFileCount const
Update to latest module versions.
Fixed makefile path to framework solution.
Updated .gitignore for new framework directory structure.
Merged in Linux support.
Removed old TskModules folder
Changed AM_CONFIG_HEADERS to AC_CONFIG_HEADERS
Updated to latest 4.1-linux-build versions of modules.
Fixed include path.
Made condition argument to TskImgDB::getFileCount const
Update to latest module versions.
Fixed makefile path to framework solution.
Updated .gitignore for new framework directory structure.
Merge branch 'new-4.1-staging' of github.com:basis-technology-corp/sleuthkit into new-4.1-staging