Merge branch 'master' into input-revamp

Conflicts:
	bionics.cpp
	game.cpp