Saving before merge attempt
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java
Merge pull request #491 from mrtizmo/develop

Localized text for option panels in HashDatabase and KeywordSearch modules
For actions package in Core module, pulled static strings into properties.
Created empty Bundle_ja.properties.
Added new public methods to HashDbManager for creating, loading, and removing HashDb objects. Also consolidated multiple HashDbManager exception types into one.
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle_ja.properties
Initial translation of action/bundle

Still have 2 questions.  See todo's.
Merge pull request #495 from APriestman/develop

New public functions in HashDbManager for creating and modifying hash databases
Defined IngestModuleException that an ingest module may throw if init() fails.
Merge pull request #496 from raman-bt/develop

Defined IngestModuleException that an ingest module may throw if init() fails.
Fixed  the access specifier on the exception constructor so it it actually be constructed (outside this pkg)
Merge pull request #497 from raman-bt/develop

Fixed  the access specifier on the exception constructor so it it actually be constructed (outside this pkg)
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Resolved the last 2 todo's.  Translation completed.
Merge remote-tracking branch 'origin/develop' into develop
Added special XML file type check to reduce exceptions that get thrown - Tika seems to try to fully parse the XML file
Merge branch 'develop' of github.com:sleuthkit/autopsy into develop
sort extension config file, added extensions for text and kmz
Sort app types too
Added developers list to docs