Fixing minor issue in powermap
Merge branch 'masterDGTal' into bugPowerMap
changelog
Fixing conflicts from master
strange missing file
Merge pull request #814 from dcoeurjo/bugPowerMap

Fixing minor issue in powermap