Merge remote-tracking branch 'origin/master'

Conflicts:
	src/moutonsimulator/Elements/CompetenceAnimale.java