+ fix Provider prefix
+ Fix resource file override
Merge pull request #230 from jmpascal/MERGING-1

Fix Beta