FarmMeasurementInline added to FarmSample view
Merge branch 'master' of github.com:WorldCocoa/CocoaMap