fixed link to JavaDocs and spell-checked
fixing rebase error
fixing divergent branches
Merge branch 'master' into gh-pages