Merge pull request #418 from bhariharan/unstable

Merge 'master' into unstable
Add Javadoc target to ant script
Change wording on title
Merge pull request #419 from bhariharan/master

Add Javadoc target to ant script
Merge branch 'master' into unstable