[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2183: Serving xml as well (for better visibility), cleaned up, refactored, small fixes.