Fix #225: align affine zero in Merge as in spec
In the latest specification, part 8.4.4.2 precises that zero affine models added at the end of the list must be counted into the list size by incrementing numCurrMergeCand. But in the current implementation, numCurrMergeCand is not incremented. This merge request proposes a fix so that VTM becomes aligned with spec.