F92 - Add support for non-boundary locations on the claim map. Started
refactoring of markers logic
Merge remote-tracking branch 'origin/master'

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