Header changes
Merge remote-tracking branch 'origin/master' into karner-dev
Merge branch 'master' into karner-dev

Conflicts:
	src/com/geoodk/collect/android/activities/OSM_Map.java
Merge pull request #4 from GeoODK/karner-dev

Karner dev