Merge remote-tracking branch 'origin/master'

Conflicts:
	MineSweeper/src/main/java/com/minesweeper/BlockUI.java