resolved merge conflicts
Merged integration, and resolved conflict
AUTO-825 using subtraction instead addition to calculate the last submission value
Merge pull request #256 from GrabNetworks/dev-jd

AUTO-825