fix2
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	chess4j-server/src/main/resources/web/assets/board.css