test1
Merge remote-tracking branch 'origin/master' into sths

Conflicts:
	src/game.cpp
test2