[Branch ~dhis2-devs-core/dhis2/trunk] Rev 190: Merged geostat application with dhis-web-mapping