Merge remote-tracking branch 'origin/master'

Conflicts:
	QtChess/QtChess.pro.user
	QtChess/chessboard.cpp
	QtChess/chessfigure.cpp
	QtChess/chessfigure.h
	QtChess/figurepawn.cpp
	QtChess/figurepawn.h