Updated javadocs
Merge remote-tracking branch 'origin/content-provider' into content-provider-interface

Conflicts:
	pom.xml