fixes
Merge origin/master

Conflicts:
	instructions.txt
	src/edu/hm/cs/se/game/app/Turn.java
	src/edu/hm/cs/se/game/client/gui/instructions.txt