Merge branch 'master' into staging

seed_data/coursewares.json

@@ -6,7 +6,7 @@
     "challengeSeed": "125407438",
     "description": [
       "Watch this 1-minute video, or simply read this summary:",
-      "Welcome to Free Code Camp. We're a community of busy people learning to code by building projects for nonprofits.",
+      "Welcome to Free Code Camp. We're a community of busy people who learn to code, then practice by building projects for nonprofits.",
       "We built this community because learning to code is hard. But anyone who can stay motivated can learn to code. And to stay motivated, you just need to: <ol><li>make friends with people who code</li><li>code a little every day</li><ol>",
       "All our challenges are <ol><li>free</li><li>self-paced</li><li>browser-based</li></ol>",
       "We'll spend <ol><li>200 hours learning tools like HTML, CSS, JavaScript, Node.js and databases</li><li>600 hours building practice projects</li><li>800 hours building full stack solutions for nonprofits</li></ol>",

seed_data/field-guides.json

@@ -283,6 +283,7 @@
       "  <h4>",
       "    <ol>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.atlanta/' target='_blank'>Atlanta</a></li>",
+      "      <li><a href='https://www.facebook.com/groups/free.code.camp.asheville/' target='_blank'>Asheville</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.austin/' target='_blank'>Austin</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.bandung/' target='_blank'>Bandung</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.belgrade/' target='_blank'>Belgrade</a></li>",
@@ -306,6 +307,7 @@
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.dubai/' target='_blank'>Dubai</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.edmonton/' target='_blank'>Edmonton</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.northern.arizona/' target='_blank'>Flagstaff</a></li>",
+      "      <li><a href='https://www.facebook.com/groups/free.code.camp.frankfurt.main/' target='_blank'>Frankfurt</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.Glendora.California/' target='_blank'>Glendora</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.jakarta/' target='_blank'>Jakarta</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.Hermosillo/' target='_blank'>Hermosillo</a></li>",
@@ -321,6 +323,8 @@
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.karachi/' target='_blank'>Karachi</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.kemerovo/' target='_blank'>Kemerovo</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.kiev/' target='_blank'>Kiev</a></li>",
+      "      <li><a href='https://www.facebook.com/groups/free.code.camp.kolkata/' target='_blank'>Kolkata</a></li>",
+      "      <li><a href='https://www.facebook.com/groups/free.code.camp.krasnodar/' target='_blank'>Krasnodar</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.kryvyi.rih/' target='_blank'>Kryvyi Rih</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.lahore/' target='_blank'>Lahore</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.limassol/' target='_blank'>Limassol</a></li>",
@@ -350,9 +354,12 @@
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.northern.arizona/' target='_blank'>Prescott</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.pristina/' target='_blank'>Pristina</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.providence/' target='_blank'>Providence</a></li>",
+      "      <li><a href='https://www.facebook.com/groups/free.code.camp.provo/' target='_blank'>Provo</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.raleigh/' target='_blank'>Raleigh</a></li>",
+      "      <li><a href='https://www.facebook.com/groups/free.code.camp.recife' target='_blank'>Recife</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.richmond/' target='_blank'>Richmond</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.rio.de.janeiro/' target='_blank'>Rio de Janeiro</a></li>",
+      "      <li><a href='https://www.facebook.com/groups/free.code.camp.rotterdam/' target='_blank'>Rotterdam</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.sacramento/' target='_blank'>Sacramento</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.saint.george/' target='_blank'>Saint George</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.salt.lake.city/' target='_blank'>Salt Lake City</a></li>",
@@ -368,6 +375,7 @@
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.taipei/' target='_blank'>Taipei</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.tampa/' target='_blank'>Tampa</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.tempe.phoenix.scottsdale/' target='_blank'>Tempe</a></li>",
+      "      <li><a href='https://www.facebook.com/groups/free.code.camp.tirana/' target='_blank'>Tirana</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.tulsa/' target='_blank'>Tulsa</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.northern.arizona/' target='_blank'>Verde Valley</a></li>",
       "      <li><a href='https://www.facebook.com/groups/free.code.camp.washington.dc/' target='_blank'>Washington, DC</a></li>",