[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1538: Added ActivityPlan & GOI reports for NBITS