experiment with json
clean up testing
Merge branch 'master' of https://github.com/Tarostar/DHIS2_GeoLocationApp