Merge branch 'master' into running_fov

Conflicts:
	src/player.h