resolution conflit
Merge branch 'master' of
https://github.com/FLSTPrjBotanique/PrjFLSTBotanique.git

Conflicts:
	src/com/prjbotanique/model/Plante.java
Merge branch 'master' of
https://github.com/FLSTPrjBotanique/PrjFLSTBotanique

Conflicts:
	src/com/prjbotanique/model/Tree.java