Made javadoc optional
Merge branch 'master' of github.com:flexiblepower/fpai-shared-config