Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
line endings
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Merge pull request #460 from mrtizmo/develop

KeywordSearch Module Japanese Localization
Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop
Added createInstanceUninitialized() method.
whitespace?
Merge remote-tracking branch 'upstream/develop' into develop
Revert "Reformatted code."

This reverts commit d6e0366c735ba3fd12854e6d0897a41670efaa4c.
Merge pull request #464 from rcordovano/japanese_localization

Revert "Reformatted code."
Add notes on running with localization for Japan
Merge pull request #465 from rcordovano/japanese_localization

Add notes on running with localization for Japan
Merge pull request #463 from mrtizmo/develop

Converted remaining searchBox.setText function calls to use getMessages
Merge branch 'publicize' into develop