[Branch ~dhis2-devs-core/dhis2/trunk] Rev 753: (GIS) Code reorganised, improved and trimmed.