Added some javadoc, moved keywords for preferences to a singel file.
conflict fix