Merge branch 'master' into develop

# Conflicts:
#	cps/db.py
#	cps/web.py

cps/templates/detail.html

@@ -144,10 +144,10 @@
             </div>
           {% endif %}
 
-          {% if g.user.is_authenticated %}
-            {% if g.user.kindle_mail %}
+            {% if g.user.kindle_mail and g.user.is_authenticated %}
             <a href="{{url_for('send_to_kindle', book_id=entry.id)}}" id="sendbtn" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-send"></span> {{_('Send to Kindle')}}</a>
             {% endif %}
+          {% if (g.user.role_download() and g.user.is_anonymous()) or g.user.is_authenticated %}
               <div class="btn-group" role="group">
                 <button id="btnGroupDrop2" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   <span class="glyphicon glyphicon-eye-open"></span> {{_('Read in browser')}}