Fixed MCHMS indicators in MOH731 so that they can be serialized/de-serialized
* PregnancyStage.ANY removed and null used instead
* Unit tests for MOH731 and 711 now also test serialization/de-serialization
Changed InProgramCalculation to once again take a Program as a param rather than a program id since this wasn't the problem with serialization (turned out to be problem with null values)
Reworked report names/descriptions. E.g. "G: ART", "G" is the name and "ART" is the description