[Branch ~dhis2-devs-core/dhis2/trunk] Rev 761: Modify classes into CHR module according to end-user's requirements

[DHIS_2_Users]