Merge branch 'stable' into tl

Conflicts:
	package.json
	test/integration/hook.cors_csrf.test.js
	test/unit/router.bind.test.js

Author: sgress454

CHANGELOG.md

@@ -6,6 +6,13 @@
 * [BUGFIX] Fix [RangeError: Maximum call stack size exceeded] error in PubSub hook
 * [ENHANCEMENT] Support layout for Ractive template engine
 
+### 0.11.2
+
+* [BUGFIX] Fixes to allow proper installation / execution in environments using Node 4 and/or NPM 3.
+
+### 0.11.1
+
+* Shhhh nothing to see here (version skipped)
 
 ### 0.11.0
 

lib/hooks/csrf/index.js

@@ -77,7 +77,7 @@ module.exports = function(sails) {
           var allowCrossOriginCSRF = sails.config.csrf.origin.split(',').map(trim).indexOf(req.headers.origin) > -1;
 
           if (sails.config.csrf.protectionEnabled) {
-            var connect = require('express/node_modules/connect');
+            var connect = require('connect');
 
             try {
               return connect.csrf()(req, res, function() {

lib/hooks/session/index.js

@@ -22,7 +22,7 @@ var signCookie = require('cookie-signature').sign;
 
 // (this dependency is only here for sails.session.generate()-
 //  which is really only here to enable socket lifecycle callbacks)
-var ConnectSession = require('express/node_modules/connect').middleware.session.Session;
+var ConnectSession = require('connect').middleware.session.Session;
 
 
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sails",
   "author": "Mike McNeil <@mikermcneil>",
-  "version": "0.11.1-rc1",
+  "version": "0.11.2",
   "description": "API-driven framework for building realtime apps, using MVC conventions (based on Express and Socket.io)",
   "homepage": "http://sailsjs.org",
   "keywords": [
@@ -34,6 +34,7 @@
     "captains-log": "~0.11.8",
     "colors": "~0.6.2",
     "commander": "~2.1.0",
+    "connect": "2.25.0",
     "connect-flash": "~0.1.1",
     "cookie": "0.1.2",
     "cookie-signature": "1.0.4",
@@ -71,13 +72,13 @@
     "sails-build-dictionary": "~0.10.1",
     "sails-disk": "~0.10.0",
     "sails-generate": "~0.12.0",
-    "sails-hook-sockets": "^0.11.13",
+    "sails-hook-sockets": "^0.11.25",
     "sails-stringfile": "~0.3.0",
     "sails-util": "~0.10.3",
     "semver": "~2.2.1",
     "skipper": "~0.5.5",
     "uid-safe": "^1.0.1",
-    "waterline": "0.10.26"
+    "waterline": "~0.10.17"
   },
   "devDependencies": {
     "root-require": "~0.2.0",
@@ -86,7 +87,6 @@
     "istanbul": "*",
     "wrench": "~1.5.1",
     "benchmark": "~1.0.0",
-    "microtime": "~1.2.0",
     "colors": "~0.6.2",
     "expect.js": "~0.2.0",
     "should": "~2.1.1",