Changes for generating class/interface combinations
Merge branch 'generateInterfaces'
Updating javadoc config
Updates to javadoc plugin config