Merge branch 'master' into Develop

# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt

cps/templates/user_edit.html

@@ -26,6 +26,7 @@
       <label for="kindle_mail">{{_('Kindle E-Mail')}}</label>
       <input type="email" class="form-control" name="kindle_mail" id="kindle_mail" value="{{ content.kindle_mail if content.kindle_mail != None }}">
     </div>
+    {% if not content.role_anonymous() %}
     <div class="form-group">
     <label for="locale">{{_('Language')}}</label>
         <select name="locale" id="locale" class="form-control">
@@ -34,6 +35,8 @@
             {% endfor %}
         </select>
     </div>
+    {% endif %}
+
     <div class="form-group">
       <label for="default_language">{{_('Show books with language')}}</label>
         <select name="default_language" id="default_language" class="form-control">