Merge origin/master

Conflicts:
	test/manille/JeuManilleTest.java