Merge branch 'master' into bootstrap4

CHANGES.md

@@ -3,6 +3,7 @@
 ## 3.3.4 (Unreleased)
 
 - Avoid `eval` (via `_.template` from lodash).
+- Bugfix. Avatars weren't being shown.
 
 ## 3.3.3 (2018-02-14)
 

src/converse-chatboxes.js

@@ -96,6 +96,7 @@
             _converse.ChatBox = Backbone.Model.extend({
                 defaults: {
                     'type': 'chatbox',
+                    'show_avatar': true,
                     'bookmarked': false,
                     'chat_state': undefined,
                     'num_unread': 0,