Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade

server/boot/redirects.js

@@ -0,0 +1,22 @@
+module.exports = function(app) {
+  var router = app.loopback.Router();
+
+  router.get('/nonprofit-project-instructions', function(req, res) {
+    res.redirect(
+      301,
+      '/field-guide/how-do-free-code-camps-nonprofit-projects-work'
+    );
+  });
+
+  router.get('/agile', function(req, res) {
+    res.redirect(301, '/pmi-acp-agile-project-managers');
+  });
+
+  router.get('/privacy', function(req, res) {
+    res.redirect(
+      301, '/field-guide/what-is-the-free-code-camp-privacy-policy?'
+    );
+  });
+
+  app.use(router);
+};