Searchoptions

Bundles and Bundles_ja (japanese localization) .properties conflicts resolved: I used develop branch for every conflict except those properties that were new with head (my branch). The .java conflicts were easily resolved.