Merge pull request #21 from Windower/4.1

Merge pull request #535 from z16/4.1
Libs/Resources: Fixed for new resources format
Merge pull request #536 from z16/4.1

Libs/Resources: Fixed for new resources format