Merge branch 'master' into develop
case 2404 - Splitted table into two different tables with two different subtotals for each. Repositioning of "Pay" button and alteration of compensation display text.
case 2404 - Fixed else placement.
case 2404 - Corrected spacing in parentheses and brought string to single line.
Merge branch 'case-2404' into develop
Merge remote-tracking branch 'origin/develop'