Changed inconsistent translation of type from 種類　to タイプ
Merge remote-tracking branch 'origin/hashDatabase' into hashDatabase

Conflicts:
	HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle_ja.properties
Changed inconsistent translation of type from 種類　to タイプ
Changed inconsistent translation of type from インフォメーション　to 情報
Merge branch 'hashDatabase' of ssh://repo.narfindustries.com/autopsy-jp into hashDatabase
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into hashDatabase
Merge pull request #618 from mrtizmo/hashDatabase

HashDatabase module - translation consistency fix