Merge branch 'master' into filter_random_gen_by_source

# Conflicts:
#	src/db/bestiary_proxy.rs
#	src/db/data_providers/raw_query_builder.rs
#	src/db/shop_proxy.rs
#	src/models/creature/creature_struct.rs
#	src/models/routers_validator_structs.rs
#	src/services/encounter_service.rs