Conflicts:
	install/sql/incremental/upd_dev_collection.sql
	server/plugins-available/bind_plugin.inc.php

Implements a colored background if bind fails to load the zone due to errors
Implements a status text if errors occured
Implements not removing a zone if errors occur. instead old zone stays loaded

Implemented a checkbox "enable DNSSEC" in DNS-Wizard

This Checkbox can be enabled or disabled by template.

Further I fixed an inconsistent design (HTML) which was introduced by @tbrehm yesterday I tink. (DKIM-Checkbox)

As everytime I only edited german and english language

See merge request !309

This Checkbox can be enabled or disabled by template.

Further I fixed an inconsistent design (HTML) which was introduced by @tbrehm yesterday I tink. (DKIM-Checkbox)

DNSSEC-Fix: Possible transfer issue

This fixes the current fact that auto-resigned zones do not change their serial which might cause slave dns servers not to replicate the zone with new RRSIGs.
This is kind of a critical fix.

See merge request !308

Fixed cron to update serial and not sign directly. This now issues a job for the cron server which will then generate the zone and sign it.
cleaner solution AND fixes a possible replication (zone-transfer) issue.

Refs #3817 - Adds a CLIENTID token parsed only for the "Add Client" form from a Reseller

Makes the CLIENTID token available in the add/edit reseller limit tab

See merge request !307

Fixed Open Issue #3789 php-fpm reload workaround targeted at Ubuntu 14.04 breaks newer/fixed PHP packages on Ubuntu 14.04

Comments out special handling for reloading PHP-FPM on CentOS7, refs #3739

As per #3739 and #3816 , comment out special handling for PHP-FPM reloading on CentOS7, allowing multiple FPM processes to co-exist.

See merge request !306

More files translated to es_ES



See merge request !305

Add Spanish templates to mail notifications

Add templates to Spanish mail notifications

See merge request !303

Language es_ES in progress, new (untraslated) strings and fixes in existing ones

Language es_ES in progress, new (untraslated) strings and fixes in existing ones

See merge request !299

Support different Crypt Hash Algorithms

Support different hashing algorithms by just checking if the saved password starts with $ or not.
No computation of salt needed, just use saved password.

See merge request !304

Master



See merge request !302

fixed sieve mail filter creation

if the filter rule uses "begins with", the regex should be "^$searchterm" instead of " $searchterm"

See merge request !297