A hack if an emergency fix is needed
Merge pull request #320 from 28msec/HackForFiscalPeriodCollision

A hack if an emergency fix is needed
renamings
Merge branch 'refs/heads/master' into FAC
adapted expected results to new report