Also improved styles for new material design Conflicts: app/css/desktop.css app/partials/desktop/im.html app/vendor/jquery.emojiarea/jquery.emojiarea.js