Assets Read Me
Merge branch 'master' into nordling-dev
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 branch 'master' into karner-dev

Conflicts:
	src/com/geoodk/collect/android/activities/OSM_Map.java