GBE-504 Started aggregating javadoc in documentation module
GBE-504 Assemble javadoc for modules
Merge branch 'GBE-504-Assemble-javadoc-in-documentation-modules' of github.com:kurohyou/geomajas-project-server into kurohyou-GBE-504-Assemble-javadoc-in-documentation-modules
Merge branch 'kurohyou-GBE-504-Assemble-javadoc-in-documentation-modules'

Conflicts:
	plugin/deskmanager/pom.xml
GBE-504: correction merge code