For sales
Merge remote-tracking branch 'origin/master'

Conflicts:
	AIMS/GUI/Pos/Piece/PieceOperation.vb