working on pasturing intervention for PPF
bad commit for instance (to fix)
Merge branch 'master' of https://github.com/ekylibre/ekylibre

Conflicts:
	config/locales/eng/models.yml
	lib/ekylibre/record/base.rb
clean code