Merge branch 'master' into courseware

app.js

@@ -183,7 +183,7 @@ app.use(helmet.csp({
         '*.twitter.com'
     ].concat(trusted),
     frameSrc: [
-        
+
         '*.gitter.im',
         '*.gitter.im https:',
         '*.vimeo.com',
@@ -332,7 +332,7 @@ app.post(
 );
 
 app.get('/privacy', function(req, res) {
-  res.redirect(301, '/field-guide/what-is-free-code-camp\'s-privacy-policy');
+  res.redirect(301, '/field-guide/what-is-the-free-code-camp-privacy-policy?');
 });
 
 app.get('/api/slack', function(req, res) {

seed_data/coursewares.json

@@ -29,7 +29,7 @@
       "Now check your email and click the link in the email from Slack",
       "Complete the sign up process, then update your biographical information and upload an image. A picture of your face works best. This is how people will see you in the chat room, so put your best foot forward.",
       "Now enter the general chat room and introduce yourself to our chat room by typing: \"hello world!\".",
-      "Note that you're expected to follow our Code of Conduct: <a href='/field-guide/what-is-free-code-camp's-code-of-conduct' target='_blank'>http://freecodecamp.com/field-guide/what-is-free-code-camp's-code-of-conduct</a>.",
+      "Note that you're expected to follow our Code of Conduct: <a href='/field-guide/what-is-the-free-code-camp-code-of-conduct?' target='_blank'>http://freecodecamp.com/field-guide/what-is-the-free-code-camp-code-of-conduct?</a>",
       "Tell your fellow campers how you found Free Code Camp. Also tell us why you want to learn to code.",
       "Keep the chat room open while you work through the other challenges. That way you ask for help if you get stuck on a challenge. You can also socialize when you feel like taking a break.",
       "You can also access this chat room by clicking the \"Chat\" button in the upper right hand corner."

seed_data/field-guides.json

@@ -592,7 +592,7 @@
   },
   {
     "_id": "bd7158d9c451eddfaeb5bdee",
-    "name": "What is Free Code Camp's Code of Conduct?",
+    "name": "What is the Free Code Camp Code of Conduct?",
     "description": [
       "<div class='col-xs-12 col-sm-10 col-sm-offset-1'>",
       "  <h2>Free Code Camp is friendly place to learn to code. We're committed to keeping it that way.</h2>",
@@ -616,7 +616,7 @@
   },
   {
     "_id": "bd7158d9c451eddfaeb5bdef",
-    "name": "What is Free Code Camp's Privacy Policy?",
+    "name": "What is the Free Code Camp Privacy Policy?",
     "description": [
       "<div class='col-xs-12 col-sm-10 col-sm-offset-1'>",
       "  <h3>Free Code Camp is committed to respecting the privacy of visitors to our web sites and web applications. The guidelines below explain how we protect the privacy of visitors to FreeCodeCamp.com and its features.</h3>",

views/account/show.jade

@@ -46,7 +46,7 @@ block content
                     .col-xs-12.col-sm-12.col-md-3.text-center
                         .background-svg.img-center
                             .points-on-top
-                                = "[ " + (user ? progressTimestamps.length : 0) + " ]"
+                                = "[ " + (progressTimestamps.length) + " ]"
 
 
             .row