Merge branch 'bitcoin-core:master' into pt_br-translation

Author: txuintxunfly

README.md

@@ -73,7 +73,7 @@ pages dated in the future (such as prepared release announcements).
 To test the site:
 
     bundle exec jekyll build --future --drafts --unpublished
-    bundle exec htmlproofer --disable-external --url-ignore '/^\/bin/.*/' ./_site
+    bundle exec htmlproofer --check-html --disable-external --url-ignore '/^\/bin/.*/' ./_site
 
 The additional parameters to `jekyll build` ensure that all possible
 pages are built and checked.

_layouts/home.html

@@ -29,6 +29,7 @@
 {% endif %}
 
 <div id="main" role="main">
+  <div class="article-author-side">&nbsp;</div>
   <div id="index">
     {% assign navigation = site.data.navigation[page.lang] %}
     <h3><a href="{{ navigation.blog.url }}">Recent Posts</a></h3>

_layouts/page.html

@@ -29,6 +29,7 @@
 {% endif %}
 
 <div id="main" role="main">
+  <div class="article-author-side">&nbsp;</div>
   <article class="page">
     <h1>{{ page.title | xml_escape }}</h1>
     <div class="article-wrap">

_layouts/post-index.html

@@ -29,6 +29,7 @@
 {% endif %}
 
 <div id="main" role="main">
+  <div class="article-author-side">&nbsp;</div>
   <div id="index">
     <h1>{{ page.title | xml_escape }}</h1>
     {% capture written_year %}'None'{% endcapture %}

_layouts/post.html

@@ -29,6 +29,7 @@
 {% endif %}
 
 <div id="main" role="main">
+  <div class="article-author-side">&nbsp;</div>
   <article class="post h-entry">
     <div class="headline-wrap">
       {% if page.link %}

logs/2016-05-zurich-meeting-notes.html

@@ -502,7 +502,7 @@ <h3>Encrypted transactions and UTXO set commitments</h3>
 
 <p>Bundle committed transactions with a hard-fork, and this different reduced SPV model. Luke disagrees that they implement SPV because they don't even do fraud proofs. </p>
 
-<p><a name="lightning-network-key-derivation" /></p>
+<p><a name="lightning-network-key-derivation"></a></p>
 
 <h3>Lightning Network key derivation function</h3>