Resources helper unit test
Updates to use the new Resources schema in various parts of the code
first import
Import ObjectLoader
Bug fixed
More bug fixes
Merge pull request #1582 from atsareg/dev-resources

Updates in various parts of the code to use new Resources and Statuses