fixed javadoc unknown tag errors
Merge branch 'bugfix_javadoc_html'