Merge branch 'master' of /Users/sylvainchen/git/test-github/empire-v2/Empire_v2 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Mise à jour de jeu, case, recolteur
+ Javadoc