removed some unused fields from SOLR schema
Add ingest module settings serialization method stubs to IngestJobLauncher
Merge remote-tracking branch 'upstream/develop' into serialize_ingest_module_settings
Add getVersionNumber() method to IngestModuleIngestJobSettings interface
Lots of KeywordSearch refactoring
Merge branch 'develop' of github.com:sleuthkit/autopsy into develop
Implement serialization of ingest module settings
Improve error handling in IngestJobLauncher
Merge remote-tracking branch 'upstream/develop' into serialize_ingest_module_settings
ingestJobs now has its own lock (itself); ingestTasks still uses this for locking
converted ingestJobs into a ConcurrentHashMap
Merge remote-tracking branch 'upstream/develop' into unfreeze
remove unnecessary declare/assignment break
resolved conflicts
Added image extensions to each other
Fixed file type panel, which was too wide
Merge pull request #686 from SynapticNulship/unfreeze

Improve ingestJobs concurrency
Replace Java lib object stream with NetBeans object streams for ingest module settings serialization
Merge remote-tracking branch 'upstream/develop' into serialize_ingest_module_settings
Make hash lookup job settings panel use settings for always calc hashes