Fixed some date calculations
Merge branch 'master' of https://github.com/mcasperson/BIRT-JSON-Report-Template