Merge remote-tracking branch 'origin/dragon_choose'

Conflicts:
	game/labels/location/forest/lb_location_forest_main.rpy