Merge remote-tracking branch 'origin/master'

Conflicts:
	SetGame/src/game/Settings.java
test
test