Merge commit 'bc99f00d1aee6a78f1297e5f48f8d6811d0e887f' into HEAD

Author: Jenkins Continuous Integration Server

app/directives/external-account/external-link-data.directive.jade

@@ -2,7 +2,7 @@
   .external-link-tile(ng-repeat="account in linkedAccountsData", ng-class="{'external-link-tile--editable' : editable, 'external-link-tile--pending' : account.status === 'PENDING' || account.data.status === 'PENDING'}", ng-click="openLink(account)")
     .top
       .ext-link-tile_edit-header(ng-show="editable && account.provider === 'weblink'")
-        .ext-link-tile_edit-header_delete(ng-click="confirmDeletion(account)", ng-class="{'ext-link-tile_edit-header_delete--disabled': account.deletingAccount || account.status === 'PENDING'}")
+        .ext-link-tile_edit-header_delete(ng-click="confirmDeletion(account)", ng-class="{'ext-link-tile_edit-header_delete--disabled': account.deletingAccount || account.status === 'PENDING'}", prevent-event-propagation)
       div.logo
         i.fa(ng-class="(account|providerData:'className') || 'fa-globe'")
       h2 {{account|providerData:"displayName"}}

app/sitemap/sitemap.jade

@@ -23,7 +23,7 @@
         li 
           a(href="/community/design") Design
         li  
-          a(href="/community/devlopment") Development
+          a(href="/community/development") Development
         li 
           a(href="/community/data-science") Data Science
         li 

assets/css/directives/external-link-deletion-confirm.scss

@@ -27,7 +27,7 @@
 }
 
 .deletion-confirmation-message {
-  @include merriweather-sans-regular;//TODO use sansbook font
+  @include font-with-weight('Merriweather Sans', 300);
 
   .deletion-confirmation-account-title {
     font-style: italic;