Added support for Grand Total 3
Merge pull request #392 from jverdeyen/grand-total

Added support for Grand Total 3
Merged with master and fixed merge conflicts