Tons o javadoc
Merge branch 'api-javadoc' into develop

Conflicts:
	README.md