Merge branch 'stable-3.1' into 'stable-3.1'

.gitignore

interface/lib/classes/functions.inc.php

interface/web/admin/templates/server_ip_list.htm

interface/web/client/templates/clients_list.htm

interface/web/client/templates/resellers_list.htm

interface/web/dns/templates/dns_soa_admin_list.htm

interface/web/dns/templates/dns_soa_edit.htm

interface/web/dns/templates/dns_soa_list.htm

interface/web/mail/templates/mail_user_list.htm

interface/web/sites/templates/cron_list.htm

interface/web/sites/templates/database_admin_list.htm

interface/web/sites/templates/database_list.htm

...rface/web/sites/templates/web_vhost_domain_admin_list.htm

interface/web/sites/templates/web_vhost_domain_list.htm

interface/web/themes/default/assets/javascripts/ispconfig.js