Merge origin/master

Conflicts:
	manifest.mf
Merge origin/dev into dev

Conflicts:
	src/main/java/game/Board.java
	src/main/java/game/Player.java
Merge origin/dev into dev

Conflicts:
	src/main/java/game/Board.java
	src/main/java/game/Player.java