global replace of resources->market to correct a previous bad refactor
Merge branch 'develop'