Merge branch 'master' into nordling-dev
Merge pull request #2 from GeoODK/nordling-dev

Merge branch 'master' into nordling-dev