Fix effectiveness report fields
Follow up cost analysis report refactor
Merge branch 'master' of https://github.com/cirope/mawidabp