...
Merge remote-tracking branch 'origin/master'

Conflicts:
	Jeu_de_la_vie/src/api/core/Cell.java
	Jeu_de_la_vie/src/api/core/NextGeneration.java