Made correction on inconsistent translation
made DataModelActionsFactory and its static methods public
Merge pull request #571 from millmanorama/public_DataModelActionsFactory

made DataModelActionsFactory and its static methods public
Changed ingest method calls to work with the new ingest framework.
Removing dead code.
Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop
Getting rid of an unused field.
Merge pull request #572 from rcordovano/parallel_file_ingest

Updated sample ingest modules, adding factory, settings and settings pan...
Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop
Merge pull request #573 from alexjacks92/develop

Test script now reflects new ingest framework, and has been cleaned up a bit.
Fixing UI test hang up - removed section of code that looked for a checkbox that has been removed.
Merge pull request #574 from alexjacks92/develop

Fixing UI test hang up - removed section of code that looked for a check...
Fixed an issue searching through logs for strings that aren't there.
Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop
Merge branch 'core-filesearch' of ssh://repo.narfindustries.com/autopsy-jp into core-filesearch
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into core-filesearch
Made methods public again
Merge pull request #576 from mrtizmo/core-filesearch

Core - filesearch module - translation correction
Fix sizing issues in the KeywordSearch advanced options GUI.
Merge pull request #578 from SynapticNulship/keyword_option_gui

Fix sizing issues in the KeywordSearch advanced options GUI.