Merge branch 'master' of https://github.com/rbalda/MineSweeper into Branch_Merge

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