Working TestSmartEntity
Trying to resolve conflicts.
Merge branch 'master' of
https://Wiressel@github.com/Yannholo/Space-Vivarium-UTBM.git

Conflicts:
	src/spaceVivarium/TestFenetreConf.java