Merged from branch (Building Construction Requirements can now be specified by generic material types AND specific types of items, eg wooden logs).