adding in a shortuuid field for farm and beneficiary as well as a few more admin polishes
Merge branch 'master' of github.com:WorldCocoa/CocoaMap
uuid to Farm and Beneficiary with searching on FarmSample