F115 - Adapted field names to server side implementation
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/fao/sola/clients/android/opentenure/ClaimActivity.java