Currently the public folder has:
The first one is meaningful and defines the `wood.tree` resource and the corresponding map colour, among other things; the third and fifth replace that with `food.fruit`; the second and fourth only define a footprint and are thus not really worth a separate template. The bush vs tree distinction is arbitrary (and varies between languages, cultures, and people); functionally there is no difference in game.
This patch changes it to a cleaner and clearer:
Having one generic template corresponding to a resource subtype is also consistent with:
For the specific gaia/flora_*.xml templates:
* the parents are updated accordingly;
* <ResourceSupply/Amount> is inserted to those that didn't have it yet;
* unnecessary ` Tree` is removed from specific name strings.