Merge origin/master

Conflicts:
	UzChess/src/uzchess/core/model/Echiquier.java