Merge pull request #6 from GeoODK/master

Update Repo to match the master
Merge pull request #7 from GeoODK/nordling-dev

Merge pull request #6 from GeoODK/master