Merge branch 'master' into flyyouhigh

Conflicts:
	src/gamelogic/shared/bg_gameplay.h
	src/gamelogic/shared/bg_public.h