Merge branch 'master' into nordling-dev
Manifest Update
Mainifest Update2
Merge pull request #2 from GeoODK/nordling-dev

Merge branch 'master' into nordling-dev
Fixes: Bug drag location marker, onPause method fixed duplicate markers
Changes: marker popup background color
Merge pull request #6 from GeoODK/master

Update Repo to match the master