Merge branch 'dev' of https://github.com/mbret/jenseits-von-theben into dev

Conflicts:
	src/main/java/com/miage/game/Board.java
	src/test/java/com/miage/game/TestBoard.java