Merge origin/master

Conflicts:
	src/View/GameBoard.java
Merge origin/master