added javadoc for 2.1.0
Merge branch 'release/release-1'