Merge branch '4_5_x' of github.com:xtuple/xtuple into server-npm-integration

Conflicts:
	npm-shrinkwrap.json
	package.json

diff --cc package.json
index 5443d1c,75ea3d8..5501347
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -34,7 -24,7 +34,8 @@@
      "less": "1.5.0",
      "moment": "2.4.x",
      "nodemailer": "0.3.x",
 +    "nvd3": "^1.1.15",
+     "node-forge": "0.6.x",
      "oauth2orize": "0.1.x",
      "oauth2orize-jwt-bearer": "0.1.x",
      "passport": "0.1.x",

diff --cc test/lib/zombie_auth.js
Simple merge