Conflicts: include/config.php update.php
less html in conversation.php removed unused tpls fixed old themes