Added site java doc support
Merge remote-tracking branch 'origin/pom_work' into pom_work

Conflicts:
	pom.xml