Conflicts: file/js/TimWolla.WCF.Chat.coffee file/lib/system/chat/commands/ChatCommandHandler.class.php