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

Conflicts:
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java
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
Merge pull request #495 from APriestman/develop

New public functions in HashDbManager for creating and modifying hash databases