Merge pull request #161 from CityGenerator/develop

update res gen
Test
un test.
Merge branch 'feature/ResourceGenerator' of github.com:CityGenerator/CityGenerator into feature/ResourceGenerator
New files for Resource generation.
Merge branch 'hotfix/v2.1.1' into develop
Framed out the narrative for resources.
Mostly code comeplete.  Still need to integrate into the application.
Problem calling my generator.
Trapped for missing variable.
Made the formatter for resources print a string rather than an array.
Added additional trapping for establishment names.
Messed around with the resource loop.  The count generation is not great
and the loop does not work right. Donno why.
Removed dead code and formatted fro use with city generator.
Merge branch 'develop' into feature/ResourceGenerator

Conflicts:
	lib/CityGenerator.pm
	lib/EstablishmentGenerator.pm
	xml/resources.xml
more fixes for resource merge
Merge pull request #185 from CityGenerator/feature/ResourceGenerator

pulled develop in to catch it up, added some fixes, and I think it's good.