javadoc added to api elements
merge