Merge branch 'master' into ux-improvements

Conflicts:
	seed_data/coursewares.json

views/resources/learn-to-code.jade

@@ -6,7 +6,10 @@ block content
         img.img-responsive.img-center(src='https://s3.amazonaws.com/freecodecamp/wide-social-banner.png')
     br
     .text-center
-        a.btn.btn-cta.signup-btn.next-challenge-button(href="/challenges") Take me to my next challenge
+        if (user)
+            a.btn.btn-cta.signup-btn.next-challenge-button(href="/challenges") Take me to my next challenge
+        else
+            a.btn.btn-cta.signup-btn.next-challenge-button(href="/signin") Start learning to code (it's free)
     br
     .row
         .col-xs-12.col-sm-12.col-md-4