[ResourceLocator]
- Fix multiple resource file support which was hopelessly broken
Merge branch 'develop' of https://github.com/GSoft-SharePoint/Dynamite-2010 into develop