GPII-115: Merging registry resolver code with master branch

Author: kaspermarkus

gpii/index.js

@@ -1,7 +1,7 @@
 var fluid = require("universal");
 
 fluid.require("registrySettingsHandler", require);
-fluid.require("registryResolver", require);
+fluid.require("registryResolver", require);
 fluid.require("spiSettingsHandler", require);
 
-module.exports = fluid;
+module.exports = fluid;