Javadoc update

Updated javadocs
Javadoc navigation
Merge pull request #22 from jorgeb1980/development

Development