Javadoc for 2.1
Merge pull request #420 from bhariharan/gh-pages

Javadoc for 2.1