[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2352: Re-added missing resources in common. And minor changed in excel reporting module.