Fixed Javadoc offline reference.
Updates.
Merge branch 'develop'