Resolve merge conflict

install/lib/installer_base.lib.php

install/tpl/apache_ispconfig.conf.master

interface/web/admin/lib/lang/ar_server_config.lng

interface/web/admin/lib/lang/ar_users.lng

interface/web/admin/lib/lang/ar_users_list.lng

interface/web/admin/lib/lang/bg_server_config.lng

interface/web/admin/lib/lang/bg_users.lng

interface/web/admin/lib/lang/br_server_config.lng

interface/web/admin/lib/lang/br_users.lng

interface/web/admin/lib/lang/ca_server_config.lng

interface/web/admin/lib/lang/ca_users.lng

interface/web/admin/lib/lang/ca_users_list.lng

interface/web/admin/lib/lang/cz_server_config.lng

interface/web/admin/lib/lang/cz_users.lng

interface/web/admin/lib/lang/de_server_config.lng

interface/web/admin/lib/lang/de_users.lng

interface/web/admin/lib/lang/dk_server_config.lng

interface/web/admin/lib/lang/dk_users.lng

interface/web/admin/lib/lang/el_server_config.lng

interface/web/admin/lib/lang/el_users.lng