javadoc for PM
Merge branch 'development_bjorn' of https://github.com/flexiblepower/powermatcher into development_thijl