Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Changed project ot development status so that error messages go to console
Fixed bug that caused null pointer exception when displaying keyword hits.  Other minor refactoring
refactoring of keyword search markup classes
fixed renaming issue in layer.xml
Added artifact ID to artifact content viewer
Fixed bug that caused duplicate keyword hit entries to exist
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Tagged hard coded strings with \\NON-NLS
don't hash directories and prevent adding empty file hash value to database
USB device parser adds vendor name when product code isn't known
Merge branch 'develop' of github.com:sleuthkit/autopsy into develop
Added more extensions to config file
Restored default behavior to ignore text files
Dropping tsk_files obj_id istead of replacing.
Merge pull request #736 from mrtizmo/lastphase3

Tagged hard coded strings with //NON-NLS
Merge pull request #738 from alexjacks92/IdBug

Dropping tsk_files object ID instead of replacing it.
Write to log files in case log directory
Merge pull request #739 from rcordovano/log_files_to_logs_folder

Log files to logs folder