Changes on exploitation.aird
Merge https://github.com/JeanHany/farmingdsl

Conflicts:
	fr.esir.lsi.exploitation/model/exploitation.aird