Merge branch 'mobile-news'

Conflicts:
	views/challengeMap/show.jade

views/resources/nonprofits.jade

@@ -8,7 +8,7 @@ block content
                     .big-break
                     .col-xs-12.col-sm-12.col-md-12
                         .embed-responsive.embed-responsive-16by9
-                            iframe.embed-responsive-item(src='https://www.youtube.com/embed/KOs0m_AhkXA')
+                            iframe.embed-responsive-item(src='//player.vimeo.com/video/126228100')
                         .big-break
                     h2 Our process:
                     .row

views/resources/pmi-acp-agile-project-managers.jade

@@ -8,7 +8,7 @@ block content
                     .big-break
                     .col-xs-12.col-sm-12.col-md-12
                         .embed-responsive.embed-responsive-16by9
-                            iframe.embed-responsive-item(src='https://www.youtube.com/embed/KOs0m_AhkXA')
+                            iframe.embed-responsive-item(src='//player.vimeo.com/video/126228100')
                         .big-break
                     h2 Your opportunity:
                     .row

views/resources/sitemap.jade

@@ -60,7 +60,7 @@ urlset(xmlns="http://www.sitemaps.org/schemas/sitemap/0.9")
   //- Stories
   each story in stories
     url
-      loc #{appUrl}/stories/#{story.replace(/\s/g, '-')}
+      loc #{appUrl}/news/#{story.replace(/\s/g, '-')}
       lastmod= now
       changefreq daily
       priority= 0.9