Merging resourceloader branch into trunk. Full documentation is at http://www.mediawi...